From 0fcac545e60a835776e9507ab2899aeb757403cc Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 12 Jan 2015 10:53:31 -0500 Subject: [PATCH] For now, just prompt users to start background services at the end of the install process --- .../build/airtime-setup/forms/finish-settings.php | 9 +++++++-- airtime_mvc/public/setup/finish-setup.php | 11 ----------- installer/install | 6 +++--- .../media-monitor/install/airtime-media-monitor.conf | 1 - python_apps/media-monitor/setup.py | 2 +- python_apps/pypo/install/airtime-liquidsoap.conf | 1 - python_apps/pypo/install/airtime-playout.conf | 1 - python_apps/pypo/setup.py | 2 +- 8 files changed, 12 insertions(+), 21 deletions(-) diff --git a/airtime_mvc/build/airtime-setup/forms/finish-settings.php b/airtime_mvc/build/airtime-setup/forms/finish-settings.php index 549cb9472..a4157bc24 100755 --- a/airtime_mvc/build/airtime-setup/forms/finish-settings.php +++ b/airtime_mvc/build/airtime-setup/forms/finish-settings.php @@ -5,8 +5,13 @@

Setup Complete!

- Looks like you're almost done! 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! + 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. +

+

+ 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/airtime_mvc/public/setup/finish-setup.php b/airtime_mvc/public/setup/finish-setup.php index bcbd9e087..a6fc158c2 100755 --- a/airtime_mvc/public/setup/finish-setup.php +++ b/airtime_mvc/public/setup/finish-setup.php @@ -29,11 +29,6 @@ class FinishSetup extends Setup { $errors[] = "ERR"; } - if (empty($errors)) { - // Write service configurations for pypo and media-monitor - $this->startServices(); - } - return array( "message" => $message, "errors" => $errors, @@ -49,10 +44,4 @@ class FinishSetup extends Setup { && unlink(AIRTIME_CONF_TEMP_PATH); } - function startServices() { - exec("service airtime-media-monitor start"); - exec("service airtime-playout start"); - exec("service airtime-liquidsoap start"); - } - } \ No newline at end of file diff --git a/installer/install b/installer/install index 7e3e89cf7..a17ed2efd 100755 --- a/installer/install +++ b/installer/install @@ -322,7 +322,6 @@ verbose "...Done" verbose "\n * Creating /usr/lib/airtime..." mkdir -p /usr/lib/airtime -mkdir -p /var/www/.init verbose "...Done" verbose "\n * Creating /run/airtime..." @@ -373,8 +372,9 @@ verbose "\n * Creating liquidsoap symlink..." ln -sf /usr/bin/liquidsoap /usr/bin/airtime-liquidsoap verbose "...Done" -for i in /var/www/.init/airtime*; do - sed -i 's/WEB_USER/${web_user}/g' $i +for i in /etc/init/airtime*; do + chmod 644 $i + sed -i "s/WEB_USER/${web_user}/g" $i done initctl reload-configuration diff --git a/python_apps/media-monitor/install/airtime-media-monitor.conf b/python_apps/media-monitor/install/airtime-media-monitor.conf index 321f0270a..0afe7ebc8 100755 --- a/python_apps/media-monitor/install/airtime-media-monitor.conf +++ b/python_apps/media-monitor/install/airtime-media-monitor.conf @@ -11,6 +11,5 @@ setgid WEB_USER env LANG='en_US.UTF-8' env LC_ALL='en_US.UTF-8' -env HOME='/var/www/.init' exec airtime-media-monitor \ No newline at end of file diff --git a/python_apps/media-monitor/setup.py b/python_apps/media-monitor/setup.py index 0fe17ecc5..c35c36131 100755 --- a/python_apps/media-monitor/setup.py +++ b/python_apps/media-monitor/setup.py @@ -12,7 +12,7 @@ if '--no-init-script' in sys.argv: data_files = [] sys.argv.remove('--no-init-script') # super hax else: - data_files = [('/var/www/.init', ['install/airtime-media-monitor.conf'])] + data_files = [('/etc/init', ['install/airtime-media-monitor.conf'])] print data_files setup(name='airtime-media-monitor', diff --git a/python_apps/pypo/install/airtime-liquidsoap.conf b/python_apps/pypo/install/airtime-liquidsoap.conf index 6c95ade7b..7a975e632 100755 --- a/python_apps/pypo/install/airtime-liquidsoap.conf +++ b/python_apps/pypo/install/airtime-liquidsoap.conf @@ -11,6 +11,5 @@ setgid WEB_USER env LANG='en_US.UTF-8' env LC_ALL='en_US.UTF-8' -env HOME='/var/www/.init' exec airtime-liquidsoap diff --git a/python_apps/pypo/install/airtime-playout.conf b/python_apps/pypo/install/airtime-playout.conf index 79197443c..fe2d3c8dc 100755 --- a/python_apps/pypo/install/airtime-playout.conf +++ b/python_apps/pypo/install/airtime-playout.conf @@ -11,6 +11,5 @@ setgid WEB_USER env LANG='en_US.UTF-8' env LC_ALL='en_US.UTF-8' -env HOME='/var/www/.init' exec airtime-playout \ No newline at end of file diff --git a/python_apps/pypo/setup.py b/python_apps/pypo/setup.py index fc5335f36..955e75cce 100755 --- a/python_apps/pypo/setup.py +++ b/python_apps/pypo/setup.py @@ -12,7 +12,7 @@ if '--no-init-script' in sys.argv: data_files = [] sys.argv.remove('--no-init-script') # super hax else: - data_files = [('/var/www/.init', ['install/airtime-playout.conf', 'install/airtime-liquidsoap.conf'])] + data_files = [('/etc/init', ['install/airtime-playout.conf', 'install/airtime-liquidsoap.conf'])] print data_files setup(name='airtime-playout',