From ab89b80b8545cc39dd7bf7e7bc4930d9814a63f2 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 21 May 2013 17:36:57 -0400 Subject: [PATCH] remove unnecessary install code for saas --- .../media-monitor/install/media-monitor-copy-files.py | 7 +++++++ python_apps/pypo/install/pypo-copy-files.py | 7 +++++++ 2 files changed, 14 insertions(+) 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 379e39b86..5f3b5d0f0 100644 --- a/python_apps/media-monitor/install/media-monitor-copy-files.py +++ b/python_apps/media-monitor/install/media-monitor-copy-files.py @@ -41,6 +41,13 @@ try: if not os.path.exists(PATH_INI_FILE): shutil.copy('%s/../media-monitor.cfg'%current_script_dir, PATH_INI_FILE) + # load config file + try: + config = ConfigObj(PATH_INI_FILE) + except Exception, e: + print 'Error loading config file: ', e + sys.exit(1) + #copy monit files shutil.copy('%s/../../monit/monit-airtime-generic.cfg'%current_script_dir, '/etc/monit/conf.d/') subprocess.call('sed -i "s/\$admin_pass/%s/g" /etc/monit/conf.d/monit-airtime-generic.cfg' % get_rand_string(), shell=True) diff --git a/python_apps/pypo/install/pypo-copy-files.py b/python_apps/pypo/install/pypo-copy-files.py index f23ed3cc3..e88b46a64 100644 --- a/python_apps/pypo/install/pypo-copy-files.py +++ b/python_apps/pypo/install/pypo-copy-files.py @@ -78,6 +78,13 @@ try: os.chown("/etc/airtime", -1, gid) os.chmod("/etc/airtime", stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR | stat.S_IRGRP | stat.S_IWGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) + # load config file + try: + config = ConfigObj(PATH_INI_FILE) + except Exception, e: + print 'Error loading config file: ', e + sys.exit(1) + #copy monit files shutil.copy('%s/../../monit/monit-airtime-generic.cfg'%current_script_dir, '/etc/monit/conf.d/') subprocess.call('sed -i "s/\$admin_pass/%s/g" /etc/monit/conf.d/monit-airtime-generic.cfg' % get_rand_string(), shell=True)