Merge branch '2.5.x-installer' of https://github.com/sourcefabric/Airtime into 2.5.x-installer

This commit is contained in:
Duncan Sommerville 2015-01-15 17:34:33 -05:00
commit 36c889a3a2
2 changed files with 4 additions and 6 deletions

8
README
View File

@ -3,7 +3,7 @@
=========================================================================
Airtime is an open source application that provides remote and
collaborative automation of a broadcast station.
collaborative automation of a broadcast radio station.
Home page: http://www.sourcefabric.org/en/airtime/
@ -61,9 +61,9 @@ There are several options for installation - to see them all, run
sudo ./install --help
2) Once you've run the installer, navigate to localhost/ (if you have a custom
apache configuration, navigate to your Airtime web host) to run an interactive
setup.
2) Once you've run the installer, open a web browser to http://localhost to run
the interactive setup. (If you have a custom apache configuration, navigate to
your Airtime web host instead.)
If you just want to run Airtime with default settings, you won't need to change
anything, but if you have any custom configuration settings you'll be able to

View File

@ -2,8 +2,6 @@
/* THIS FILE IS NOT MEANT FOR CUSTOMIZING.
* PLEASE EDIT THE FOLLOWING TO CHANGE YOUR CONFIG:
* /etc/airtime/airtime.conf
* /etc/airtime/pypo.cfg
* /etc/airtime/recorder.cfg
*/
class Config {