[checkmk-commits] Check_MK Git: check_mk: wato: This is hopefully really the latest final fix to make the omd apache shared mode work

Module: check_mk Branch: master Commit: 9b9886f880405e48132e813cf5b1675e6f4700ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b9886f880405e… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Nov 30 18:06:40 2010 +0100 wato: This is hopefully really the latest final fix to make the omd apache shared mode work --- web/htdocs/wato.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 68a5b8b..11f5921 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -499,8 +499,7 @@ def check_mk_automation(command, args=[], indata=""): cmd = commandargs + [ command ] + args else: commandargs = [ 'sudo', '/bin/su', '-', omd_site, '-c', 'check_mk --automation' ] - cmd = commandargs - cmd[-1] += ' ' + ' '.join([ command ] + args) + cmd = commandargs[:-1] + [ commandargs[-1] + ' ' + ' '.join([ command ] + args) ] if commandargs[0] == 'sudo': sudo_msg = ("<p>The webserver is running as user which has no rights on the " @@ -510,10 +509,10 @@ def check_mk_automation(command, args=[], indata=""): "<li>Append the following to the <code>/etc/sudoers</code> file:\n" "<pre># Needed for WATO - the Check_MK Web Administration Tool\n" "Defaults:%s !requiretty\n" - "%s ALL = (%s) NOPASSWD: %s *\n" + "%s ALL = (root) NOPASSWD: %s\ *\n" "</pre></li>\n" "<li>Retry this operation</li></ol>\n" % - (apache_user, apache_user, omd_site, " ".join(commandargs[1:]))) + (apache_user, apache_user, " ".join(commandargs[1:-1] + [ commandargs[-1].replace(' ', '\ ')]))) try: p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)