From e5f2e8d0446a3106adf8c9723a881d8f3f1a9d7f Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Thu, 14 Apr 2011 16:03:23 -0400
Subject: [PATCH] CC-2169 : All logging should go to /var/log

moving pypo/recorder logs to folder /var/log/airtime
---
 python_apps/pypo/install/pypo-daemontools-logger.sh         | 2 +-
 python_apps/pypo/install/pypo-install.py                    | 6 +++---
 python_apps/pypo/install/pypo-uninstall.py                  | 2 +-
 .../show-recorder/install/recorder-daemontools-logger.sh    | 2 +-
 python_apps/show-recorder/install/recorder-install.py       | 6 +++---
 python_apps/show-recorder/install/recorder-uninstall.py     | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/python_apps/pypo/install/pypo-daemontools-logger.sh b/python_apps/pypo/install/pypo-daemontools-logger.sh
index 9673575db..249bfd78b 100755
--- a/python_apps/pypo/install/pypo-daemontools-logger.sh
+++ b/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
diff --git a/python_apps/pypo/install/pypo-install.py b/python_apps/pypo/install/pypo-install.py
index 1171dfe23..5a49f3205 100755
--- a/python_apps/pypo/install/pypo-install.py
+++ b/python_apps/pypo/install/pypo-install.py
@@ -72,9 +72,9 @@ try:
   create_user("pypo")
 
   print "Creating log directories"
-  create_path("/var/log/pypo")
-  os.system("chmod -R 755 /var/log/pypo")
-  os.system("chown -R pypo:pypo /var/log/pypo")
+  create_path("/var/log/airtime/pypo")
+  os.system("chmod -R 755 /var/log/airtime/pypo")
+  os.system("chown -R pypo:pypo /var/log/airtime/pypo")
 
   create_path(BASE_PATH)
   create_path(BASE_PATH+"bin")
diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py
index cd22e9c4c..36ffd2370 100755
--- a/python_apps/pypo/install/pypo-uninstall.py
+++ b/python_apps/pypo/install/pypo-uninstall.py
@@ -32,7 +32,7 @@ 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")
     
     print "Removing pypo files"
     remove_path(BASE_PATH)
diff --git a/python_apps/show-recorder/install/recorder-daemontools-logger.sh b/python_apps/show-recorder/install/recorder-daemontools-logger.sh
index 9673575db..7d53b9653 100644
--- a/python_apps/show-recorder/install/recorder-daemontools-logger.sh
+++ b/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
diff --git a/python_apps/show-recorder/install/recorder-install.py b/python_apps/show-recorder/install/recorder-install.py
index 1b8186391..a3f2da526 100644
--- a/python_apps/show-recorder/install/recorder-install.py
+++ b/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")
-  os.system("chmod -R 755 /var/log/recorder")
-  os.system("chown -R pypo:pypo /var/log/recorder")
+  create_path("/var/log/airtime/recorder")
+  os.system("chmod -R 755 /var/log/airtime/recorder")
+  os.system("chown -R pypo:pypo /var/log/airtime/recorder")
 
   create_path(BASE_PATH)
   create_path(BASE_PATH+"bin")
diff --git a/python_apps/show-recorder/install/recorder-uninstall.py b/python_apps/show-recorder/install/recorder-uninstall.py
index f8ab96432..5040ca8bd 100644
--- a/python_apps/show-recorder/install/recorder-uninstall.py
+++ b/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)