-remove "disable_auto_start_services" install option

install_minimal/airtime-install

@@ -26,8 +26,7 @@ showhelp () {
 --pypo|-p                         Install only pypo and liquidsoap
 --show-recorder|-s                Install only show-recorder
 --web|-w                          Install only files for web-server
---liquidsoap-keep-alive|-l        Keep Liquidsoap alive when upgrading
---disable-auto-start-services|-d  Disable auto-starting Airtime services"
+--liquidsoap-keep-alive|-l        Keep Liquidsoap alive when upgrading"
 }
 
 overwrite="f"
@@ -39,9 +38,8 @@ pypo="f"
 showrecorder="f"
 web="f"
 liquidsoap_keep_alive="f"
-disable_auto_start_services="f"
 
-set -- $(getopt -l help,overwrite,preserve,no-db,reinstall,media-monitor,pypo,show-recorder,web,liquidsoap-keep-alive,disable-auto-start-services "hopnrmyswld" "$@")
+set -- $(getopt -l help,overwrite,preserve,no-db,reinstall,media-monitor,pypo,show-recorder,web,liquidsoap-keep-alive "hopnrmyswl" "$@")
 while [ $# -gt 0 ]
 do
     case "$1" in
@@ -55,7 +53,6 @@ do
     (-s|--show-recorder) showrecorder="t";;
     (-w|--web) web="t";;
     (-l|--liquidsoap-keep-alive) liquidsoap_keep_alive="t";;
-    (-d|--disable-auto-start-services) disable_auto_start_services="t";;
     
     (--) shift; break;;
     (-*) echo "$0: error - unrecognized option $1" 1>&2; exit 1;;
@@ -147,7 +144,6 @@ export nodb
 export overwrite
 export preserve
 export liquidsoap_keep_alive
-export disable_auto_start_services
 
 set +e
 test "$mediamonitor" = "t" -o "$pypo" = "t" -o "$showrecorder" = "t"

install_minimal/include/airtime-initialize.sh

@@ -53,7 +53,6 @@ sleep 1
 
 set +e
 
-if [ "$disable_auto_start_services" = "f" ]; then
 if [ "$mediamonitor" = "t" ]; then
     monit monitor airtime-media-monitor
 fi
@@ -61,10 +60,6 @@ if [ "$disable_auto_start_services" = "f" ]; then
     monit monitor airtime-playout
     monit monitor airtime-liquidsoap
 fi
-#    if [ "$showrecorder" = "t" ]; then
-#        monit monitor airtime-show-recorder
-#    fi
-fi
 
 monit monitor rabbitmq-server
 set -e

python_apps/media-monitor/install/media-monitor-copy-files.py

@@ -50,7 +50,7 @@ try:
     #copy monit files
     shutil.copy('%s/../../monit/monit-airtime-generic.cfg'%current_script_dir, '/etc/monit/conf.d/')
     subprocess.call('sed -i "s/\$admin_pass/%s/g" /etc/monit/conf.d/monit-airtime-generic.cfg' % get_rand_string(), shell=True)
-    if os.environ["disable_auto_start_services"] == "f":
+
     shutil.copy('%s/../monit-airtime-media-monitor.cfg'%current_script_dir, '/etc/monit/conf.d/')
     
     #create log dir

python_apps/media-monitor/install/media-monitor-initialize.py

@@ -9,7 +9,7 @@ try:
     #create media-monitor dir under /var/tmp/airtime
     if not os.path.exists("/var/tmp/airtime/media-monitor"):
         os.makedirs("/var/tmp/airtime/media-monitor")
-    if os.environ["disable_auto_start_services"] == "f":
+
     #update-rc.d init script
     p = Popen("update-rc.d airtime-media-monitor defaults >/dev/null 2>&1", shell=True)
     sts = os.waitpid(p.pid, 0)[1]

python_apps/pypo/install/pypo-copy-files.py

@@ -51,7 +51,7 @@ try:
     shutil.copy('%s/../../monit/monit-airtime-generic.cfg'%current_script_dir, '/etc/monit/conf.d/')
     subprocess.call('sed -i "s/\$admin_pass/%s/g" /etc/monit/conf.d/monit-airtime-generic.cfg' % get_rand_string(), shell=True)
     shutil.copy('%s/../../monit/monit-airtime-rabbitmq-server.cfg'%current_script_dir, '/etc/monit/conf.d/')
-    if os.environ["disable_auto_start_services"] == "f": 
+
     shutil.copy('%s/../monit-airtime-liquidsoap.cfg'%current_script_dir, '/etc/monit/conf.d/')
     shutil.copy('%s/../monit-airtime-playout.cfg'%current_script_dir, '/etc/monit/conf.d/')
 

python_apps/pypo/install/pypo-initialize.py

@@ -111,7 +111,6 @@ try:
     else:
         print "Unable to connect to the Airtime server."
 
-    if os.environ["disable_auto_start_services"] == "f": 
     #initialize init.d scripts
     p = Popen("update-rc.d airtime-playout defaults >/dev/null 2>&1", shell=True)
     sts = os.waitpid(p.pid, 0)[1]