From 4c9c86bf4fa09bbeddaca7edc0849b9701da556d Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Wed, 1 Jun 2011 14:18:58 -0400
Subject: [PATCH] cc-2055: switch to init.d

-remove update-rc.d on uninstall
-remove unecessary imports in install/uninstall scripts
-all daemons now wait until apache2 is available before starting (LSB Init Script)
---
 install/airtime-install                                  | 4 ++--
 install/airtime-uninstall                                | 4 ++--
 python_apps/{create_pypo_user.py => create-pypo-user.py} | 4 ++++
 python_apps/media-monitor/airtime-media-monitor-init-d   | 9 +++++++++
 .../media-monitor/install/media-monitor-uninstall.py     | 2 +-
 python_apps/pypo/airtime-playout-init-d                  | 9 +++++++++
 python_apps/pypo/install/pypo-install.py                 | 6 ------
 python_apps/pypo/install/pypo-uninstall.py               | 2 +-
 python_apps/{remove_pypo_user.py => remove-pypo-user.py} | 4 ++++
 python_apps/show-recorder/airtime-show-recorder-init-d   | 9 +++++++++
 python_apps/show-recorder/install/recorder-install.py    | 7 -------
 python_apps/show-recorder/install/recorder-uninstall.py  | 2 +-
 12 files changed, 42 insertions(+), 20 deletions(-)
 rename python_apps/{create_pypo_user.py => create-pypo-user.py} (90%)
 rename python_apps/{remove_pypo_user.py => remove-pypo-user.py} (80%)

diff --git a/install/airtime-install b/install/airtime-install
index f83510f90..f995d14a7 100755
--- a/install/airtime-install
+++ b/install/airtime-install
@@ -19,8 +19,8 @@ python ${SCRIPTPATH}/../python_apps/create-pypo-user.py
 echo -e "\n*** Pypo Installation ***"
 python ${SCRIPTPATH}/../python_apps/pypo/install/pypo-install.py
 
-#echo -e "\n*** Recorder Installation ***"
-#python ${SCRIPTPATH}/../python_apps/show-recorder/install/recorder-install.py
+echo -e "\n*** Recorder Installation ***"
+python ${SCRIPTPATH}/../python_apps/show-recorder/install/recorder-install.py
 
 #echo -e "\n*** Media Monitor Installation ***"
 #python ${SCRIPTPATH}/../python_apps/pytag-fs/install/media-monitor-install.py
diff --git a/install/airtime-uninstall b/install/airtime-uninstall
index 6445a9965..d8db1d429 100755
--- a/install/airtime-uninstall
+++ b/install/airtime-uninstall
@@ -12,8 +12,8 @@ php ${SCRIPTPATH}/airtime-uninstall.php
 echo -e "\n*** Uninstalling Pypo ***"
 python ${SCRIPTPATH}/../python_apps/pypo/install/pypo-uninstall.py
 
-#echo -e "\n*** Uninstalling Show Recorder ***"
-#python ${SCRIPTPATH}/../python_apps/show-recorder/install/recorder-uninstall.py
+echo -e "\n*** Uninstalling Show Recorder ***"
+python ${SCRIPTPATH}/../python_apps/show-recorder/install/recorder-uninstall.py
 
 #echo -e "\n*** Uninstalling Media Monitor ***"
 #python ${SCRIPTPATH}/../python_apps/pytag-fs/install/media-monitor-uninstall.py
diff --git a/python_apps/create_pypo_user.py b/python_apps/create-pypo-user.py
similarity index 90%
rename from python_apps/create_pypo_user.py
rename to python_apps/create-pypo-user.py
index bdaf98442..38619a0f3 100644
--- a/python_apps/create_pypo_user.py
+++ b/python_apps/create-pypo-user.py
@@ -26,4 +26,8 @@ def create_user(username):
 
 
 if __name__ == "__main__":
+    if os.geteuid() != 0:
+        print "Please run this as root."
+        sys.exit(1)
+    
     create_user("pypo")
diff --git a/python_apps/media-monitor/airtime-media-monitor-init-d b/python_apps/media-monitor/airtime-media-monitor-init-d
index db38dd67a..efdc8fa73 100755
--- a/python_apps/media-monitor/airtime-media-monitor-init-d
+++ b/python_apps/media-monitor/airtime-media-monitor-init-d
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+### BEGIN INIT INFO
+# Provides:          airtime-media-monitor
+# Required-Start:    $local_fs $remote_fs $network $syslog apache2
+# Required-Stop:     $local_fs $remote_fs $network $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Manage airtime-media-monitor daemon
+### END INIT INFO
+
 USERID=pypo
 GROUPID=pypo
 NAME=Airtime
diff --git a/python_apps/media-monitor/install/media-monitor-uninstall.py b/python_apps/media-monitor/install/media-monitor-uninstall.py
index bc1fb8d4e..082ce2072 100755
--- a/python_apps/media-monitor/install/media-monitor-uninstall.py
+++ b/python_apps/media-monitor/install/media-monitor-uninstall.py
@@ -3,7 +3,6 @@
 
 import os
 import sys
-import time
 from configobj import ConfigObj
 
 if os.geteuid() != 0:
@@ -30,6 +29,7 @@ try:
 
     os.system("/etc/init.d/airtime-media-monitor stop")
     os.system("rm -f /etc/init.d/airtime-media-monitor")
+    os.system("update-rc.d -f airtime-media-monitor remove")
     
     print "Removing log directories"
     remove_path(config["log_dir"])
diff --git a/python_apps/pypo/airtime-playout-init-d b/python_apps/pypo/airtime-playout-init-d
index 6beb333a0..34efb98d7 100755
--- a/python_apps/pypo/airtime-playout-init-d
+++ b/python_apps/pypo/airtime-playout-init-d
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+### BEGIN INIT INFO
+# Provides:          airtime-playout
+# Required-Start:    $local_fs $remote_fs $network $syslog apache2
+# Required-Stop:     $local_fs $remote_fs $network $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Manage airtime-playout daemon
+### END INIT INFO
+
 USERID=pypo
 GROUPID=pypo
 NAME=Airtime
diff --git a/python_apps/pypo/install/pypo-install.py b/python_apps/pypo/install/pypo-install.py
index a84479b6e..e0f3dcd7a 100755
--- a/python_apps/pypo/install/pypo-install.py
+++ b/python_apps/pypo/install/pypo-install.py
@@ -3,15 +3,9 @@
 
 import time
 import os
-import traceback
 from optparse import *
 import sys
-import time
-import datetime
-import logging
-import logging.config
 import shutil
-import string
 import platform
 from configobj import ConfigObj
 from subprocess import Popen
diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py
index 00281c268..bfa77eb0e 100755
--- a/python_apps/pypo/install/pypo-uninstall.py
+++ b/python_apps/pypo/install/pypo-uninstall.py
@@ -3,7 +3,6 @@
 
 import os
 import sys
-import time
 from configobj import ConfigObj
 
 if os.geteuid() != 0:
@@ -30,6 +29,7 @@ try:
         
     os.system("/etc/init.d/airtime-playout stop")
     os.system("rm -f /etc/init.d/airtime-playout")
+    os.system("update-rc.d -f airtime-playout remove")
         
     print "Removing cache directories"
     remove_path(config["cache_base_dir"])
diff --git a/python_apps/remove_pypo_user.py b/python_apps/remove-pypo-user.py
similarity index 80%
rename from python_apps/remove_pypo_user.py
rename to python_apps/remove-pypo-user.py
index eb60bd085..278d6f783 100644
--- a/python_apps/remove_pypo_user.py
+++ b/python_apps/remove-pypo-user.py
@@ -11,4 +11,8 @@ def remove_user(username):
     os.system("deluser --remove-home " + username + " 1>/dev/null 2>&1")
 
 if __name__ == "__main__":
+    if os.geteuid() != 0:
+        print "Please run this as root."
+        sys.exit(1)
+        
     remove_user("pypo")
diff --git a/python_apps/show-recorder/airtime-show-recorder-init-d b/python_apps/show-recorder/airtime-show-recorder-init-d
index b77036a84..0368ac3df 100755
--- a/python_apps/show-recorder/airtime-show-recorder-init-d
+++ b/python_apps/show-recorder/airtime-show-recorder-init-d
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+### BEGIN INIT INFO
+# Provides:          airtime-show-recorder
+# Required-Start:    $local_fs $remote_fs $network $syslog apache2
+# Required-Stop:     $local_fs $remote_fs $network $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Manage airtime-show-recorder daemon
+### END INIT INFO
+
 USERID=pypo
 GROUPID=pypo
 NAME=Airtime
diff --git a/python_apps/show-recorder/install/recorder-install.py b/python_apps/show-recorder/install/recorder-install.py
index 6bada90f9..3a9b004e0 100755
--- a/python_apps/show-recorder/install/recorder-install.py
+++ b/python_apps/show-recorder/install/recorder-install.py
@@ -3,16 +3,9 @@
 
 import time
 import os
-import traceback
 from optparse import *
 import sys
-import time
-import datetime
-import logging
-import logging.config
 import shutil
-import string
-import platform
 from configobj import ConfigObj
 from subprocess import Popen
 
diff --git a/python_apps/show-recorder/install/recorder-uninstall.py b/python_apps/show-recorder/install/recorder-uninstall.py
index 4af506c9e..14cb63504 100755
--- a/python_apps/show-recorder/install/recorder-uninstall.py
+++ b/python_apps/show-recorder/install/recorder-uninstall.py
@@ -3,7 +3,6 @@
 
 import os
 import sys
-import time
 from configobj import ConfigObj
 
 if os.geteuid() != 0:
@@ -30,6 +29,7 @@ try:
 
     os.system("/etc/init.d/airtime-show-recorder stop")
     os.system("rm -f /etc/init.d/airtime-show-recorder")
+    os.system("update-rc.d -f airtime-show-recorder remove")
     
     print "Removing log directories"
     remove_path(config["log_dir"])