Module: check_mk
Branch: master
Commit: d39532389d176708d24a33a24918d92eb3422785
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d39532389d1767…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Feb 5 16:46:50 2013 +0100
FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups
---
ChangeLog | 1 +
web/htdocs/wato.py | 48 ++++++++++++++++++++++++------------------------
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9aae64a..575afc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,7 @@
* FIX: Fixed generation of auth.php (Needed for NagVis Multisite Authorisation)
* FIX: Fixed missing general.* permissions in auth.php on slave sites in
case of distributed WATO setups
+ * FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups
Event Console:
* Added UNIX socket for sending events to the EC
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 18b9a43..52e5954 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -125,30 +125,6 @@ snapshot_dir = var_dir + "snapshots/"
sync_snapshot_file = defaults.tmp_dir + "/sync_snapshot.tar.gz"
repstatus_file = var_dir + "replication_status.mk"
-# Directories and files to synchronize during replication
-replication_paths = [
- ( "dir", "check_mk", root_dir ),
- ( "dir", "multisite", multisite_dir ),
- ( "file", "htpasswd", defaults.htpasswd_file ),
- ( "file", "auth.secret", '%s/auth.secret' %
os.path.dirname(defaults.htpasswd_file) ),
- ( "file", "auth.serials", '%s/auth.serials' %
os.path.dirname(defaults.htpasswd_file) ),
- # Also replicate the user-settings of Multisite? While the replication
- # as such works pretty well, the count of pending changes will not
- # know.
- ( "dir", "usersettings", defaults.var_dir + "/web" ),
-]
-
-
-# Directories and files for backup & restore
-backup_paths = replication_paths + [
- ( "file", "sites", sites_mk)
- # autochecks are a site-local ressource. This does only make
- # sense for single-site installations. How should we handle
- # this?
- # ( "dir", "autochecks", defaults.autochecksdir ),
-
-]
-
ALL_HOSTS = [ '@all' ]
ALL_SERVICES = [ "" ]
@@ -11886,6 +11862,30 @@ def load_plugins():
g_rulespec_group = {}
g_rulespec_groups = []
+ # Directories and files to synchronize during replication
+ global replication_paths, backup_paths
+ replication_paths = [
+ ( "dir", "check_mk", root_dir ),
+ ( "dir", "multisite", multisite_dir ),
+ ( "file", "htpasswd", defaults.htpasswd_file ),
+ ( "file", "auth.secret", '%s/auth.secret' %
os.path.dirname(defaults.htpasswd_file) ),
+ ( "file", "auth.serials", '%s/auth.serials' %
os.path.dirname(defaults.htpasswd_file) ),
+ # Also replicate the user-settings of Multisite? While the replication
+ # as such works pretty well, the count of pending changes will not
+ # know.
+ ( "dir", "usersettings", defaults.var_dir + "/web"
),
+ ]
+
+ # Directories and files for backup & restore
+ backup_paths = replication_paths + [
+ ( "file", "sites", sites_mk)
+ # autochecks are a site-local ressource. This does only make
+ # sense for single-site installations. How should we handle
+ # this?
+ # ( "dir", "autochecks", defaults.autochecksdir ),
+ ]
+
+
# Declare WATO-specific permissions
config.declare_permission_section("wato", _("WATO - Check_MK's Web
Administration Tool"))