From c22f2cd5f05014ca402f89794ec93db16759dd75 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Fri, 16 Jan 2015 17:20:50 -0500 Subject: [PATCH] Clean up readability of installer --- README | 9 +-------- .../build/airtime-setup/forms/database-settings.php | 3 +++ .../build/airtime-setup/forms/finish-settings.php | 6 +++--- install | 9 +++++---- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/README b/README index 2c8ae39e0..dd997c0be 100644 --- a/README +++ b/README @@ -24,12 +24,6 @@ Major features: INSTALLATION ------------ -Please see this chapter to begin a typical installation: -http://sourcefabric.booktype.pro/airtime-25-for-broadcasters/preparing-the-server/ - -If you are a developer, please see this page: -http://wiki.sourcefabric.org/display/CC/Airtime+Dev+Site - Basic installation has two steps: 1) Run the install script, located in the Airtime root directory. @@ -41,7 +35,7 @@ For an interactive installation, run: The installer will then prompt you about how you want to set up your Airtime installation. -For a simple full installation (do this if you're installing Airtime from +For a non-interactive full installation (do this if you're installing Airtime from scratch and don't have any of your own configuration set up), run sudo ./install -fiapd @@ -83,4 +77,3 @@ Forums and mailing lists: http://forum.sourcefabric.org Bug tracker: http://dev.sourcefabric.org Source code: http://github.com/sourcefabric/Airtime IRC chat: #airtime on Freenode - diff --git a/airtime_mvc/build/airtime-setup/forms/database-settings.php b/airtime_mvc/build/airtime-setup/forms/database-settings.php index 58e17426d..08db5e225 100644 --- a/airtime_mvc/build/airtime-setup/forms/database-settings.php +++ b/airtime_mvc/build/airtime-setup/forms/database-settings.php @@ -39,6 +39,9 @@
+

+ This may take up to 30 seconds to complete! +

diff --git a/airtime_mvc/build/airtime-setup/forms/finish-settings.php b/airtime_mvc/build/airtime-setup/forms/finish-settings.php index 3bd33d795..f9a128af3 100644 --- a/airtime_mvc/build/airtime-setup/forms/finish-settings.php +++ b/airtime_mvc/build/airtime-setup/forms/finish-settings.php @@ -6,10 +6,10 @@

Looks like you're almost done! As a final step, run the following commands from the terminal: -
sudo service airtime-playout start -
sudo service airtime-liquidsoap start -
sudo service airtime-media-monitor start

+ 
sudo service airtime-playout start
+sudo service airtime-liquidsoap start
+sudo service airtime-media-monitor start

Click "Done!" to bring up the Airtime configuration checklist; if your configuration is all green, you're ready to get started with your personal Airtime station! diff --git a/install b/install index ec749b3da..84eb73111 100755 --- a/install +++ b/install @@ -577,11 +577,12 @@ fi verbose "\n * Restarting apache..." loudCmd "service apache2 restart 2>/dev/null" +IP=$(ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://') + echo -e "\n-----------------------------------------------------" echo " * Basic Setup DONE! * " echo " " -echo " To get started with Airtime, visit localhost:5000 " -echo " or, if you've set up your own web configuration, " -echo " the Airtime webroot on your webserver " -echo " in your web browser of choice " +echo " To get started with Airtime, visit ${IP} " +echo " or, if you've set up your own web configuration, " +echo " the Airtime webroot on your webserver " echo "-----------------------------------------------------"