[checkmk-commits] Check_MK Git: check_mk: FIX Fix missing authentication of PHP addons in D-WATO when activation mode is reload

Module: check_mk Branch: master Commit: 374395811b75b22a35d85c9189bc1676b9e173e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=374395811b75b2… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri May 16 11:32:46 2014 +0200 FIX Fix missing authentication of PHP addons in D-WATO when activation mode is reload When you set the activation mode in WATO from <i>restart</i> to <i>reload</i> and use distributed WATO then on the remote sites the hook for creating the authentication information for PHP addons like PNP4Nagios and NagVis would not be created. This has been fixed now. --- .werks/971 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/971 b/.werks/971 new file mode 100644 index 0000000..2a35b6c --- /dev/null +++ b/.werks/971 @@ -0,0 +1,12 @@ +Title: Fix missing authentication of PHP addons in D-WATO when activation mode is reload +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1400232694 + +When you set the activation mode in WATO from <i>restart</i> to <i>reload</i> and use +distributed WATO then on the remote sites the hook for creating the authentication +information for PHP addons like PNP4Nagios and NagVis would not be created. This has +been fixed now. diff --git a/ChangeLog b/ChangeLog index feeeefd..997320d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ * 0965 Cumulative permissions and contact groups for WATO folders... * 0781 FIX: host diag page: fixed problem with update of diagnose subwindows... * 0904 FIX: Fixed exception in host parameter overview... + * 0971 FIX: Fix missing authentication of PHP addons in D-WATO when activation mode is reload... Notifications: * 0754 Allow users to disable their notifications completely... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8faaeae..62dbb2b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5319,7 +5319,7 @@ def check_mk_local_automation(command, args=[], indata=""): "<li>Retry this operation</li></ol>\n" % (html.apache_user(), sudoline)) - if command == 'restart': + if command in [ 'restart', 'reload' ]: try: call_hook_pre_activate_changes() except Exception, e: @@ -5353,7 +5353,7 @@ def check_mk_local_automation(command, args=[], indata=""): # On successful "restart" command execute the activate changes hook - if command == 'restart': + if command in [ 'restart', 'reload' ]: call_hook_activate_changes() try: