[checkmk-commits] Move directoy calculations where they belong.

Module: check_mk Branch: master Commit: 61bdfbd778634d01e9a5b022791c79652f362f8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61bdfbd778634d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 21 10:41:14 2018 +0100 Move directoy calculations where they belong. Change-Id: Id1b22ff79b49e1624d10f28fd48e6f398cb63784 --- cmk/ec/export.py | 4 ++-- cmk/ec/settings.py | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmk/ec/export.py b/cmk/ec/export.py index fc8f04d..47fa629 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -164,7 +164,7 @@ def rule_pack_dir(): """ Returns the default WATO directory of the Event Console. """ - return _default_settings().paths.config_dir.value / "wato" + return _default_settings().paths.rule_pack_dir.value def mkp_rule_pack_dir(): @@ -173,7 +173,7 @@ def mkp_rule_pack_dir(): Returns the default directory for rule pack exports of the Event Console. """ - return _default_settings().paths.config_dir.value / "mkp" / "rule_packs" + return _default_settings().paths.mkp_rule_pack_dir.value def read_rule_packs(context): diff --git a/cmk/ec/settings.py b/cmk/ec/settings.py index fa837c3..5ca9f7d 100644 --- a/cmk/ec/settings.py +++ b/cmk/ec/settings.py @@ -51,6 +51,8 @@ AnnotatedPath = NamedTuple( Paths = NamedTuple( 'Paths', [('main_config_file', AnnotatedPath), ('config_dir', AnnotatedPath), + ('rule_pack_dir', AnnotatedPath), + ('mkp_rule_pack_dir', AnnotatedPath), ('unix_socket', AnnotatedPath), ('event_socket', AnnotatedPath), ('event_pipe', AnnotatedPath), @@ -78,6 +80,10 @@ def _default_paths(omd_root, default_config_dir): 'main configuration', default_config_dir / 'mkeventd.mk'), config_dir=AnnotatedPath( 'configuration directory', default_config_dir / 'mkeventd.d'), + rule_pack_dir=AnnotatedPath( + 'rule pack directory', default_config_dir / 'mkeventd.d' / 'wato'), + mkp_rule_pack_dir=AnnotatedPath( + 'rule pack export directory', default_config_dir / 'mkeventd.d' / 'mkp' / 'rule_packs'), unix_socket=AnnotatedPath('Unix socket', run_dir / 'status'), event_socket=AnnotatedPath('event socket', run_dir / 'eventsocket'), event_pipe=AnnotatedPath('event pipe', run_dir / 'events'),