From d7af91f306b75fb903644d0a5f41ff37bbdf0219 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 26 Mar 2012 17:59:44 -0400 Subject: [PATCH] CC-3520: Change default password of monit -done --- airtime_mvc/application/models/Systemstatus.php | 2 +- .../media-monitor/install/media-monitor-copy-files.py | 7 +++++++ python_apps/monit/monit-airtime-generic.cfg | 5 +++-- python_apps/pypo/install/pypo-copy-files.py | 7 +++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/Systemstatus.php b/airtime_mvc/application/models/Systemstatus.php index 8503a98d2..69f229b9c 100644 --- a/airtime_mvc/application/models/Systemstatus.php +++ b/airtime_mvc/application/models/Systemstatus.php @@ -10,7 +10,7 @@ class Application_Model_Systemstatus $ch = curl_init(); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_URL, $url); - curl_setopt($ch, CURLOPT_USERPWD, "admin:monit"); + curl_setopt($ch, CURLOPT_USERPWD, "guest:airtime"); $result = curl_exec($ch); curl_close($ch); 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 ecacf6ab1..1d62c42a2 100644 --- a/python_apps/media-monitor/install/media-monitor-copy-files.py +++ b/python_apps/media-monitor/install/media-monitor-copy-files.py @@ -1,6 +1,9 @@ import os import shutil import sys +import subprocess +import random +import string from configobj import ConfigObj if os.geteuid() != 0: @@ -25,6 +28,9 @@ def create_dir(path): except Exception, e: pass +def get_rand_string(length=10): + return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(length)) + PATH_INI_FILE = '/etc/airtime/media-monitor.cfg' try: @@ -43,6 +49,7 @@ try: #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) if os.environ["disable_auto_start_services"] == "f": shutil.copy('%s/../monit-airtime-media-monitor.cfg'%current_script_dir, '/etc/monit/conf.d/') diff --git a/python_apps/monit/monit-airtime-generic.cfg b/python_apps/monit/monit-airtime-generic.cfg index e4b531587..4bb0c6497 100644 --- a/python_apps/monit/monit-airtime-generic.cfg +++ b/python_apps/monit/monit-airtime-generic.cfg @@ -1,5 +1,6 @@ - set daemon 10 # Poll at 5 second intervals + set daemon 10 # Poll at 10 second intervals set logfile /var/log/monit.log set httpd port 2812 - allow admin:monit + allow admin:$admin_pass + allow guest:airtime read-only diff --git a/python_apps/pypo/install/pypo-copy-files.py b/python_apps/pypo/install/pypo-copy-files.py index 1bef4d1de..19159d55f 100644 --- a/python_apps/pypo/install/pypo-copy-files.py +++ b/python_apps/pypo/install/pypo-copy-files.py @@ -1,6 +1,9 @@ import os import shutil import sys +import subprocess +import random +import string from configobj import ConfigObj if os.geteuid() != 0: @@ -25,6 +28,9 @@ def create_dir(path): except Exception, e: pass +def get_rand_string(length=10): + return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(length)) + PATH_INI_FILE = '/etc/airtime/pypo.cfg' try: @@ -43,6 +49,7 @@ try: #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) shutil.copy('%s/../../monit/monit-airtime-rabbitmq-server.cfg'%current_script_dir, '/etc/monit/conf.d/') if os.environ["disable_auto_start_services"] == "f": shutil.copy('%s/../monit-airtime-liquidsoap.cfg'%current_script_dir, '/etc/monit/conf.d/')