Merge branch 'master' of dev.sourcefabric.org:airtime

python_apps/pypo/install/pypo-daemontools-logger.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec setuidgid pypo multilog t ./main
+exec setuidgid pypo multilog t /var/log/airtime/pypo/main

python_apps/pypo/install/pypo-install.py

@@ -72,9 +72,13 @@ try:
   create_user("pypo")
 
   print "Creating log directories"
-  create_path("/var/log/pypo")
+  create_path("/var/log/airtime/pypo")
-  os.system("chmod -R 755 /var/log/pypo")
+  os.system("chmod -R 755 /var/log/airtime/pypo")
-  os.system("chown -R pypo:pypo /var/log/pypo")
+  os.system("chown -R pypo:pypo /var/log/airtime/pypo")
+
+  create_path("/var/log/airtime/pypo-liquidsoap")
+  os.system("chmod -R 755 /var/log/airtime/pypo-liquidsoap")
+  os.system("chown -R pypo:pypo /var/log/airtime/pypo-liquidsoap")
 
   create_path(BASE_PATH)
   create_path(BASE_PATH+"bin")
@@ -112,7 +116,7 @@ try:
   create_path("/etc/service/pypo-liquidsoap")  
   create_path("/etc/service/pypo-liquidsoap/log")  
   shutil.copy("%s/pypo-daemontools-liquidsoap.sh"%current_script_dir, "/etc/service/pypo-liquidsoap/run")
-  shutil.copy("%s/pypo-daemontools-logger.sh"%current_script_dir, "/etc/service/pypo-liquidsoap/log/run")
+  shutil.copy("%s/pypo-liquidsoap-daemontools-logger.sh"%current_script_dir, "/etc/service/pypo-liquidsoap/log/run")
   os.system("chmod -R 755 /etc/service/pypo-liquidsoap")
   os.system("chown -R pypo:pypo /etc/service/pypo-liquidsoap")
 

python_apps/pypo/install/pypo-liquidsoap-daemontools-logger.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec setuidgid pypo multilog t /var/log/airtime/pypo-liquidsoap/main

python_apps/pypo/install/pypo-uninstall.py

@@ -32,7 +32,8 @@ try:
     os.system("python %s/pypo-stop.py" % get_current_script_dir())
     
     print "Removing log directories"
-    remove_path("/var/log/pypo")
+    remove_path("/var/log/airtime/pypo")
+    remove_path("/var/log/airtime/pypo-liquidsoap")
     
     print "Removing pypo files"
     remove_path(BASE_PATH)

python_apps/pypo/scripts/liquidsoap.cfg

@@ -7,7 +7,7 @@
 # general settings                        #
 ###########################################
 
-log_file = "/var/log/pypo/<script>.log"
+log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"
 log_level = 3
 
 ###########################################

python_apps/show-recorder/install/recorder-daemontools-logger.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec setuidgid pypo multilog t ./main
+exec setuidgid pypo multilog t /var/log/airtime/recorder/main

python_apps/show-recorder/install/recorder-install.py

@@ -80,9 +80,9 @@ try:
   os.system("chown -R pypo:pypo /home/pypo/Music")
 
   print "Creating log directories"
-  create_path("/var/log/recorder")
+  create_path("/var/log/airtime/recorder")
-  os.system("chmod -R 755 /var/log/recorder")
+  os.system("chmod -R 755 /var/log/airtime/recorder")
-  os.system("chown -R pypo:pypo /var/log/recorder")
+  os.system("chown -R pypo:pypo /var/log/airtime/recorder")
 
   create_path(BASE_PATH)
   create_path(BASE_PATH+"bin")

python_apps/show-recorder/install/recorder-uninstall.py

@@ -32,7 +32,7 @@ try:
     os.system("python %s/recorder-stop.py" % get_current_script_dir())
     
     print "Removing log directories"
-    remove_path("/var/log/recorder")
+    remove_path("/var/log/airtime/recorder")
     
     print "Removing recorder files"
     remove_path(BASE_PATH)