diff --git a/salt/hydra/config.sls b/salt/hydra/config.sls index 6f914aa5f..f74726cc1 100644 --- a/salt/hydra/config.sls +++ b/salt/hydra/config.sls @@ -5,7 +5,7 @@ {% from 'allowed_states.map.jinja' import allowed_states %} {% if sls.split('.')[0] in allowed_states %} -{% from "hydra/map.jinja" import hydraMERGED %} +{% from "hydra/map.jinja" import HYDRAMERGED %} hydradir: file.directory: @@ -38,8 +38,9 @@ hydraconfig: - group: 928 - mode: 600 - template: jinja + - makedirs: True - defaults: - hydraMERGED: {{ hydraMERGED }} + HYDRAMERGED: {{ HYDRAMERGED }} {% else %} diff --git a/salt/hydra/enabled.sls b/salt/hydra/enabled.sls index 3548afb4f..e0f03e184 100644 --- a/salt/hydra/enabled.sls +++ b/salt/hydra/enabled.sls @@ -54,10 +54,8 @@ so-hydra: {% endif %} - restart_policy: unless-stopped - watch: - - file: hydraschema - file: hydraconfig - require: - - file: hydraschema - file: hydraconfig - file: hydralogdir - file: hydradir