Module: check_mk
Branch: master
Commit: 40db75afd4a12e78288894a55093ced96935e81a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40db75afd4a12e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu May 24 19:35:47 2012 +0200
D/WATO: replicate auth.secret
---
.bugs/747 | 7 +++++--
ChangeLog | 2 ++
web/htdocs/wato.py | 2 ++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/.bugs/747 b/.bugs/747
index b2f83b2..3a470bd 100644
--- a/.bugs/747
+++ b/.bugs/747
@@ -1,12 +1,15 @@
Title: Replication must replicate auth.secret
Component: wato
-State: open
+Class: bug
+State: done
Date: 2012-05-11 18:00:47
Targetversion: 1.2.0
-Class: bug
The replication must not only ship htpasswd, but
also auth.secret. Otherwise a single-singon to the
remote sites will not work. This is not only needed
for addons like PNP, but also for internal web
services like that for L4m.
+
+2012-05-24 19:35:04: changed state open -> done
+Is now replicated.
diff --git a/ChangeLog b/ChangeLog
index 2d37894..d3edd77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
* FIX: Site management: replication setting was lost after re-editing
* FIX: fixed problems after changing D/WATO-configuration
* FIX: D/WATO: mark site dirty after host deletion
+ * FIX: D/WATO: replicate auth.secret, so that login on one site also
+ is valid on the replication slaves
Multisite:
* New display type 'boxes-omit-root' for BI views
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 0800979..a602e75 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -133,12 +133,14 @@ 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) ),
# 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)