Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-5001: remove /etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg on 2.3.1 upgrade 

-don't even install rabbitmq monit file
This commit is contained in:
Martin Konecny 2013-03-05 16:21:05 -05:00
parent d7d1170ee1
commit 215e5ccb4c
3 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
install_minimal/include/airtime-initialize.sh
View File

@ -45,7 +45,6 @@ chmod 600 /etc/monit/conf.d/monit-airtime-liquidsoap.cfg
chmod 600 /etc/monit/conf.d/monit-airtime-media-monitor.cfg chmod 600 /etc/monit/conf.d/monit-airtime-media-monitor.cfg
chmod 600 /etc/monit/conf.d/monit-airtime-playout.cfg chmod 600 /etc/monit/conf.d/monit-airtime-playout.cfg
chmod 600 /etc/monit/conf.d/monit-airtime-liquidsoap.cfg chmod 600 /etc/monit/conf.d/monit-airtime-liquidsoap.cfg
chmod 600 /etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg
# Start monit if it is not running, or restart if it is. # Start monit if it is not running, or restart if it is.
# Need to ensure monit is running before Airtime daemons are run. This is # Need to ensure monit is running before Airtime daemons are run. This is

1
python_apps/pypo/install/pypo-copy-files.py
View File

@ -88,7 +88,6 @@ try:
#copy monit files #copy monit files
shutil.copy('%s/../../monit/monit-airtime-generic.cfg'%current_script_dir, '/etc/monit/conf.d/') 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) 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/')
monit_version = get_monit_version() monit_version = get_monit_version()
if version_compare(monit_version, "5.3.0") >= 0: if version_compare(monit_version, "5.3.0") >= 0:

1
python_apps/pypo/install/pypo-remove-files.py
View File

@ -49,7 +49,6 @@ try:
remove_file("/etc/monit/conf.d/monit-airtime-playout.cfg") remove_file("/etc/monit/conf.d/monit-airtime-playout.cfg")
remove_file("/etc/monit/conf.d/monit-airtime-liquidsoap.cfg") remove_file("/etc/monit/conf.d/monit-airtime-liquidsoap.cfg")
remove_file("/etc/monit/conf.d/monit-airtime-generic.cfg") remove_file("/etc/monit/conf.d/monit-airtime-generic.cfg")
remove_file("/etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg")
except Exception, e: except Exception, e:
print e print e