Module: check_mk Branch: master Commit: 86b55f02077d5dac842d7063a8e70e777e4af516 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86b55f02077d5d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 2 14:41:19 2012 +0200 FIX: create sample config only if both rules.mk and hosttags.mk are missing --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4f3e94..1104226 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * FIX: fix page header after confirmation dialogs * FIX: Fixed umlaut problem in host aliases and ip addresses created by WATO * FIX: Fixed exception caused by validation problems during editing tags in WATO + * FIX: create sample config only if both rules.mk and hosttags.mk are missing 1.2.0b2: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 56e48bf..9478f56 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10375,7 +10375,7 @@ def page_user_profile(): # or rules have been defined *ever*. def create_sample_config(): if os.path.exists(multisite_dir + "hosttags.mk") \ - or os.path.exists(multisite_dir + "rules.mk"): + or os.path.exists(root_dir + "rules.mk"): return # Example values for host tags