Module: check_mk
Branch: master
Commit: 9bfbab6d9c2433ec0738853ce572f7c99a6a9116
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bfbab6d9c2433…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Apr 16 10:52:33 2012 +0200
Revert "WATO: Added wato_create_users_from_htpasswd option"
This reverts commit 9356889969d7fdd0799e070c053cebdd8a389f72.
Conflicts:
ChangeLog
---
ChangeLog | 6 ++----
web/htdocs/config.py | 1 -
web/htdocs/wato.py | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1423343..2941c11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,10 +15,8 @@
* Added new variable logwatch_rules which can also be managed through the
WATO ruleset editor (Host/Service Parameters > Parameters and rules for
inventorized checks > Various applications > Logwatch Patterns)
- * Users & Contacts: Added new option wato_create_users_from_htpasswd to make
- handling of users only appearing in htpasswd configurable. The default
- is set to True to keep the default behaviour. Users only appearing in
- htpasswd will not be shown in this GUI when the option is set to False.
+ * Users & Contacts: Added new option wato_hidden_users which holds a list
+ of userids to hide the listed users from the WATO user management GUI.
* WATO API: Added new method rewrite_configuration to trigger a rewrite of
all host related wato configuration files to distribute changed tags
diff --git a/web/htdocs/config.py b/web/htdocs/config.py
index 04df063..4d161cb 100644
--- a/web/htdocs/config.py
+++ b/web/htdocs/config.py
@@ -621,7 +621,6 @@ wato_num_hostspecs = 12
wato_num_itemspecs = 15
wato_activation_method = 'restart'
wato_write_nagvis_auth = False
-wato_create_users_from_htpasswd = True
# ____ ___
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 57fdd2b..6dc267e 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -7207,7 +7207,7 @@ def load_users():
if id in result:
result[id]["password"] = password
result[id]["locked"] = locked
- elif wato_create_users_from_htpasswd:
+ else:
# Create entry if this is an admin user
new_user = {
"roles" : config.roles_of_user(id),