diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install index 9c6800ac1..ce959286d 100755 --- a/install_full/ubuntu/airtime-full-install +++ b/install_full/ubuntu/airtime-full-install @@ -26,9 +26,9 @@ echo "----------------------------------------------------" # Updated package list sudo apt-get -y install tar gzip curl apache2 php5-pgsql libapache2-mod-php5 \ php-pear php5-gd postgresql odbc-postgresql python2.6 lame libsoundtouch-ocaml \ -libvorbis-ocaml-dev libmp3lame-dev libtaglib-ocaml libao-ocaml libmad-ocaml \ -libesd0 icecast2 sudo libportaudio2 libsamplerate0 libcamomile-ocaml-dev \ -ecasound php5-curl mpg123 rabbitmq-server monit python-virtualenv +libmp3lame-dev libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \ +libesd0 icecast2 sudo libportaudio2 libsamplerate0 rabbitmq-server \ +php5-curl mpg123 monit python-virtualenv if [ "$?" -ne "0" ]; then echo "" diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py index 1a927b969..1cbbe340f 100755 --- a/python_apps/pypo/pypofetch.py +++ b/python_apps/pypo/pypofetch.py @@ -166,20 +166,6 @@ class PypoFetch(Thread): self.cache_dir = config["cache_dir"] + self.export_source + '/' logger.info("Creating cache directory at %s", self.cache_dir) - def check_matching_timezones(self, server_timezone): - logger = logging.getLogger('fetch') - - process = Popen(["date", "+%z"], stdout=PIPE) - pypo_timezone = (process.communicate()[0]).strip(' \r\n\t') - - if server_timezone != pypo_timezone: - logger.error("ERROR: Airtime server and pypo timezone offsets do not match. Audio playback will not start when expected!!!") - logger.error(" * Server timezone offset: %s", server_timezone) - logger.error(" * Pypo timezone offset: %s", pypo_timezone) - logger.error(" * To fix this, you need to set the 'date.timezone' value in your php.ini file and restart apache.") - logger.error(" * See this page for more info (v1.7): http://wiki.sourcefabric.org/x/BQBF") - logger.error(" * and also the 'FAQ and Support' page underneath it.") - """ def get_currently_scheduled(self, playlistsOrMedias, str_tnow_s): for key in playlistsOrMedias: @@ -228,12 +214,6 @@ class PypoFetch(Thread): logger = logging.getLogger('fetch') playlists = schedule_data["playlists"] - #if bootstrapping: - #TODO: possible allow prepare_playlists to handle this. - #self.handle_shows_currently_scheduled(playlists) - - self.check_matching_timezones(schedule_data["server_timezone"]) - # Push stream metadata to liquidsoap # TODO: THIS LIQUIDSOAP STUFF NEEDS TO BE MOVED TO PYPO-PUSH!!! stream_metadata = schedule_data['stream_metadata']