diff --git a/python_apps/media-monitor/install/media-monitor-install.py b/python_apps/media-monitor/install/media-monitor-install.py index a9e7846b6..a96b3e4d4 100644 --- a/python_apps/media-monitor/install/media-monitor-install.py +++ b/python_apps/media-monitor/install/media-monitor-install.py @@ -55,7 +55,7 @@ try: print "Creating log directories" create_path(config["log_dir"]) - os.system("chmod -R 755 " + config["log_dir"]) + #os.system("chmod -R 755 " + config["log_dir"]) os.system("chown -R pypo:pypo "+config["log_dir"]) copy_dir("%s/.."%current_script_dir, config["bin_dir"]) diff --git a/python_apps/pypo/install/pypo-install.py b/python_apps/pypo/install/pypo-install.py index 44dfe3077..0853cf9a9 100644 --- a/python_apps/pypo/install/pypo-install.py +++ b/python_apps/pypo/install/pypo-install.py @@ -103,7 +103,7 @@ try: os.remove(config["bin_dir"]+"/bin/liquidsoap_scripts/liquidsoap.cfg") print "Setting permissions" - os.system("chmod -R 755 "+config["bin_dir"]) + #os.system("chmod -R 755 "+config["bin_dir"]) os.system("chown -R pypo:pypo "+config["bin_dir"]) os.system("chown -R pypo:pypo "+config["cache_base_dir"]) @@ -112,8 +112,12 @@ try: p = Popen("update-rc.d airtime-playout defaults >/dev/null 2>&1", shell=True) sts = os.waitpid(p.pid, 0)[1] + + #copy logrotate script + shutil.copy(config["bin_dir"]+"/bin/liquidsoap_scripts/airtime-liquidsoap.logrotate", "/etc/logrotate.d/airtime-liquidsoap") - # we should access the DB and generate liquidsoap.cfg under etc/airtime/ + + # we should access the DB and generate liquidsoap.cfg under /etc/airtime/ api_client = api_client.api_client_factory(config) ss = api_client.get_stream_setting() diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py index cc39187ad..c6f95da3a 100644 --- a/python_apps/pypo/install/pypo-uninstall.py +++ b/python_apps/pypo/install/pypo-uninstall.py @@ -29,6 +29,9 @@ 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 >/dev/null 2>&1") + + #copy logrotate script + os.system("rm -f /etc/logrotate.d/airtime-liquidsoap") print "Removing cache directories" remove_path(config["cache_base_dir"]) diff --git a/python_apps/pypo/liquidsoap_scripts/airtime-liquidsoap.logrotate b/python_apps/pypo/liquidsoap_scripts/airtime-liquidsoap.logrotate new file mode 100644 index 000000000..9e0efed20 --- /dev/null +++ b/python_apps/pypo/liquidsoap_scripts/airtime-liquidsoap.logrotate @@ -0,0 +1,11 @@ +/var/log/airtime/pypo-liquidsoap/ls_script.log { + compress + rotate 10 + size 1000k + missingok + notifempty + sharedscripts + postrotate + start-stop-daemon --stop --signal USR1 --quiet --pidfile /var/run/airtime-liquidsoap.pid + endscript +} diff --git a/python_apps/show-recorder/install/recorder-install.py b/python_apps/show-recorder/install/recorder-install.py index f09e47755..ad576e22f 100644 --- a/python_apps/show-recorder/install/recorder-install.py +++ b/python_apps/show-recorder/install/recorder-install.py @@ -48,7 +48,7 @@ try: print "Creating temporary media storage directory" create_path(config["base_recorded_files"]) - os.system("chmod -R 755 "+config["base_recorded_files"]) + #os.system("chmod -R 755 "+config["base_recorded_files"]) os.system("chown -R pypo:pypo "+config["base_recorded_files"]) print "Creating log directories"