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..66d94fcc5 100755 --- a/python_apps/pypo/install/pypo-install.py +++ b/python_apps/pypo/install/pypo-install.py @@ -72,9 +72,13 @@ 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("/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") diff --git a/python_apps/pypo/install/pypo-liquidsoap-daemontools-logger.sh b/python_apps/pypo/install/pypo-liquidsoap-daemontools-logger.sh new file mode 100644 index 000000000..98ac88c3b --- /dev/null +++ b/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 diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py index cd22e9c4c..004556bf0 100755 --- a/python_apps/pypo/install/pypo-uninstall.py +++ b/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) diff --git a/python_apps/pypo/scripts/liquidsoap.cfg b/python_apps/pypo/scripts/liquidsoap.cfg index a7f310f1a..467ece4d1 100644 --- a/python_apps/pypo/scripts/liquidsoap.cfg +++ b/python_apps/pypo/scripts/liquidsoap.cfg @@ -7,7 +7,7 @@ # general settings # ########################################### -log_file = "/var/log/pypo/