From ab5639ef79b38dd7d05a472699870fe30c41025f Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 21 May 2013 17:27:34 -0400 Subject: [PATCH] remove unnecessary install code for saas --- .../media-monitor/install/media-monitor-copy-files.py | 11 ----------- python_apps/pypo/install/pypo-copy-files.py | 11 ----------- 2 files changed, 22 deletions(-) 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 073f09dad..379e39b86 100644 --- a/python_apps/media-monitor/install/media-monitor-copy-files.py +++ b/python_apps/media-monitor/install/media-monitor-copy-files.py @@ -41,17 +41,6 @@ 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) - config['rabbitmq_user'] = os.environ['RABBITMQ_USER'] - config['rabbitmq_password'] = os.environ['RABBITMQ_PASSWORD'] - config['rabbitmq_vhost'] = os.environ['RABBITMQ_VHOST'] - config.write() - 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 f3e1a428d..f23ed3cc3 100644 --- a/python_apps/pypo/install/pypo-copy-files.py +++ b/python_apps/pypo/install/pypo-copy-files.py @@ -78,17 +78,6 @@ 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) - config['rabbitmq_user'] = os.environ['RABBITMQ_USER'] - config['rabbitmq_password'] = os.environ['RABBITMQ_PASSWORD'] - config['rabbitmq_vhost'] = os.environ['RABBITMQ_VHOST'] - config.write() - 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)