From 38dbc28e1cc3df553fd5b71c5e43a531c428dfe6 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 5 Jul 2012 16:07:25 -0400 Subject: [PATCH] get rid of pypo permissions since it now runs as root --- .../media-monitor/airtimefilemonitor/mediamonitorcommon.py | 3 +-- python_apps/media-monitor/install/media-monitor-copy-files.py | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py index ab8d10944..5a5ea82e2 100644 --- a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py +++ b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py @@ -83,8 +83,7 @@ class MediaMonitorCommon: # the function only changes the permission if its not readable by www-data def is_readable(self, item, is_dir): try: - return self.is_user_readable(item, 'www-data', 'www-data') \ - and self.is_user_readable(item, 'pypo', 'pypo') + return self.is_user_readable(item, 'www-data', 'www-data') except Exception, e: self.logger.warn(u"Failed to check owner/group/permissions for %s", item) return False diff --git a/python_apps/media-monitor/install/media-monitor-copy-files.py b/python_apps/media-monitor/install/media-monitor-copy-files.py index 736456db9..d47cd1811 100644 --- a/python_apps/media-monitor/install/media-monitor-copy-files.py +++ b/python_apps/media-monitor/install/media-monitor-copy-files.py @@ -54,14 +54,10 @@ try: #create log dir create_dir(config['log_dir']) - os.system("chown -R pypo:pypo "+config["log_dir"]) #copy python files copy_dir("%s/.."%current_script_dir, config["bin_dir"]) - #set executable permissions on python files - os.system("chown -R pypo:pypo "+config["bin_dir"]) - #copy init.d script shutil.copy(config["bin_dir"]+"/airtime-media-monitor-init-d", "/etc/init.d/airtime-media-monitor")