diff --git a/CREDITS b/CREDITS index 05fff9198..bb5d3dad4 100644 --- a/CREDITS +++ b/CREDITS @@ -2,11 +2,30 @@ CREDITS ======= +Version 1.7.0 +------------- +Naomi Aro (naomi.aro@sourcefabric.org) + Role: Software Developer + +Martin Konecny (martin.konecny@sourcefabric.org) + Role: Software Developer + +Ofir Gal (ofir.gal@sourcefabric.org) + Role: QA + +Daniel James + Role: Documentor & QA + +Paul Baranowski (paul.baranowski@sourcefabric.org) + Role: Project Manager + + Version 1.6.1 ------------- Version 1.6.1 fixes a problem with playout being interrupted after 48 hours. It also fixes some security issues. + Version 1.6.0 ------------- This version marks a major change to the project, completely replacing the @@ -27,11 +46,14 @@ Naomi Aro (naomi.aro@sourcefabric.org) - Conversion to Propel DB backend Martin Konecny (martin.konecny@sourcefabric.org) - Role:Software Developer + Role: Software Developer Highlights: - New User Interface - Scheduler/Backend +Ofir Gal (ofir.gal@sourcefabric.org) + Role: QA + Daniel James Role: Documentor & QA diff --git a/INSTALL b/INSTALL index 1eea4e8fe..88f7a5807 100644 --- a/INSTALL +++ b/INSTALL @@ -1,23 +1,22 @@ --------------------------------------------------------------------------------- +Airtime is the open radio software for scheduling and remote station management. +Home page: http://airtime.sourcefabric.org/ - Copyright (c) 2010-2011 Sourcefabric O.P.S. +Installation instructions are here: + http://wiki.sourcefabric.org/x/BQBF - This file is part of the Airtime project. - http://airtime.sourcefabric.org/ +Here is the manual: + http://new.flossmanuals.net/airtime/index + +To report bugs, visit our bug tracker at: + http://dev.sourcefabric.org/browse/CC + +Visit our community support forum here: + http://forum.sourcefabric.org/index.php/f/14/ - To report bugs, visit our bug tracker at: - http://dev.sourcefabric.org/browse/CC +For commercial support, see: + http://sourcefabric.org/en/services/about/347/Support.htm + or send an e-mail to contact@sourcefabric.org - Visit our community support forum here: - http://forum.sourcefabric.org/index.php/f/14/ - - For commercial support, see http://sourcefabric.org/en/services/about/347/Support.htm - or send an e-mail to contact@sourcefabric.org +If you are a developer and want to hack on Airtime, go here: + http://wiki.sourcefabric.org/display/CC --------------------------------------------------------------------------------- - -Please see this page for install instructions: -http://wiki.sourcefabric.org/display/CC/Installing+Airtime+%28v1.6%29 - -If you are a developer, see this page: -http://wiki.sourcefabric.org/display/CC diff --git a/README b/README index 111c0e95c..0747ce34a 100644 --- a/README +++ b/README @@ -4,6 +4,8 @@ Airtime is an open source application that provides remote automation of a radio station. +Home page: http://airtime.sourcefabric.org/ + Major features: * Web-based remote station management. Authorized personnel can add program material, create playlists, and schedule programming all via diff --git a/dev_tools/pl.sh b/dev_tools/pl.sh index 7c6f8b650..4e1c70134 100755 --- a/dev_tools/pl.sh +++ b/dev_tools/pl.sh @@ -1,3 +1,5 @@ #!/bin/sh - +echo +echo "This will tail the pypo-liquidsoap log file." +echo "Type in password for pypo user (default password is 'pypo'):" su -l pypo -c "tail -F /etc/service/pypo-liquidsoap/log/main/current" diff --git a/dev_tools/pr.sh b/dev_tools/pr.sh index f5e741658..aadab42ec 100755 --- a/dev_tools/pr.sh +++ b/dev_tools/pr.sh @@ -1,3 +1,7 @@ #!/bin/sh +echo +echo "This will tail the recorder log file." +echo "Type in password for pypo user (default password is 'pypo'):" + su -l pypo -c "tail -F /etc/service/recorder/log/main/current" diff --git a/dev_tools/pypoless.sh b/dev_tools/pypoless.sh index 542702527..f9db223af 100755 --- a/dev_tools/pypoless.sh +++ b/dev_tools/pypoless.sh @@ -1,3 +1,7 @@ #!/bin/sh +echo +echo "This will output the pypo log file." +echo "Type in password for pypo user (default password is 'pypo'):" + su -l pypo -c "less /etc/service/pypo/log/main/current" diff --git a/dev_tools/pypotail.sh b/dev_tools/pypotail.sh index e91cd3917..0f2168e44 100755 --- a/dev_tools/pypotail.sh +++ b/dev_tools/pypotail.sh @@ -1,3 +1,7 @@ #!/bin/sh +echo +echo "This will tail the pypo log file." +echo "Type in password for pypo user (default password is 'pypo'):" + su -l pypo -c "tail -F /etc/service/pypo/log/main/current" diff --git a/install/airtime-install.php b/install/airtime-install.php index a0428878c..227b1388f 100644 --- a/install/airtime-install.php +++ b/install/airtime-install.php @@ -26,30 +26,30 @@ AirtimeInstall::UpdateIniValue('../build/build.properties', 'project.home', real echo PHP_EOL."*** Database Installation ***".PHP_EOL; -echo "* Creating Airtime Database User".PHP_EOL; +echo "* Creating Airtime database user".PHP_EOL; AirtimeInstall::CreateDatabaseUser(); -echo "* Creating Airtime Database".PHP_EOL; +echo "* Creating Airtime database".PHP_EOL; AirtimeInstall::CreateDatabase(); AirtimeInstall::DbConnect(true); -echo "* Install Postgresql Scripting Language".PHP_EOL; +echo "* Installing Postgresql scripting language".PHP_EOL; AirtimeInstall::InstallPostgresScriptingLanguage(); -echo "* Creating Database Tables".PHP_EOL; +echo "* Creating database tables".PHP_EOL; AirtimeInstall::CreateDatabaseTables(); -echo "* Storage Directory Setup".PHP_EOL; +echo "* Storage directory setup".PHP_EOL; AirtimeInstall::SetupStorageDirectory($CC_CONFIG); -echo "* Setting Dir Permissions".PHP_EOL; +echo "* Giving Apache permission to access the storage directory".PHP_EOL; AirtimeInstall::ChangeDirOwnerToWebserver($CC_CONFIG["storageDir"]); echo "* Creating /usr/bin symlinks".PHP_EOL; AirtimeInstall::CreateSymlinks($CC_CONFIG["storageDir"]); -echo "* Importing Sample Audio Clips".PHP_EOL; +echo "* Importing sample audio clips".PHP_EOL; system(__DIR__."/../utils/airtime-import --copy ../audio_samples/ > /dev/null"); echo PHP_EOL."*** Pypo Installation ***".PHP_EOL; diff --git a/install/installInit.php b/install/installInit.php index d720daaab..1a47f4d9f 100644 --- a/install/installInit.php +++ b/install/installInit.php @@ -145,9 +145,15 @@ class AirtimeInstall { @exec($command, $output, $results); if ($results == 0) { - echo "* User {$CC_CONFIG['dsn']['username']} created.".PHP_EOL; + echo "* Database user '{$CC_CONFIG['dsn']['username']}' created.".PHP_EOL; } else { - echo "* Could not create user {$CC_CONFIG['dsn']['username']}: $output".PHP_EOL; + if (count($output) > 0) { + echo "* Could not create user '{$CC_CONFIG['dsn']['username']}': ".PHP_EOL; + echo implode(PHP_EOL, $output); + } + else { + echo "* Database user '{$CC_CONFIG['dsn']['username']}' already exists.".PHP_EOL; + } } } @@ -160,7 +166,13 @@ class AirtimeInstall { if ($results == 0) { echo "* Database '{$CC_CONFIG['dsn']['database']}' created.".PHP_EOL; } else { - echo "* Could not create database '{$CC_CONFIG['dsn']['database']}': $output".PHP_EOL; + if (count($output) > 0) { + echo "* Could not create database '{$CC_CONFIG['dsn']['database']}': ".PHP_EOL; + echo implode(PHP_EOL, $output); + } + else { + echo "* Database '{$CC_CONFIG['dsn']['database']}' already exists.".PHP_EOL; + } } } diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py index 2958c6bd4..c7b02c589 100644 --- a/python_apps/pypo/pypofetch.py +++ b/python_apps/pypo/pypofetch.py @@ -84,9 +84,12 @@ class PypoFetch(Thread): pypo_timezone = (process.communicate()[0]).strip(' \r\n\t') if server_timezone != pypo_timezone: - logger.error("Server and pypo timezone offsets do not match. Audio playback may not start when expected!") - logger.error("Server timezone offset: %s", server_timezone) - logger.error("Pypo timezone offset: %s", 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.") """ Process the schedule