For now, just prompt users to start background services at the end of the install process

This commit is contained in:
Duncan Sommerville 2015-01-12 10:53:31 -05:00
parent bf1355a203
commit 0fcac545e6
8 changed files with 12 additions and 21 deletions

View File

@ -5,8 +5,13 @@
<h3 class="form-title">Setup Complete!</h3>
<span id="helpBlock" class="help-block help-message"></span>
<p>
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:<br/>
<code>sudo service airtime-playout start</code>, <code>sudo service airtime-liquidsoap start</code>,
<code>sudo service airtime-media-monitor start</code>.
</p>
<p>
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!
</p>
<div>
<input type="submit" formtarget="finishSettingsForm" class="btn btn-primary btn-next" value="Done!"/>

View File

@ -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");
}
}

View File

@ -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

View File

@ -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

View File

@ -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',

View File

@ -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

View File

@ -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

View File

@ -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',