From b22a6cf1bb6d946c206c3ab2f3b8beed9f1d5bc5 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sat, 29 Apr 2023 23:14:30 +0200 Subject: [PATCH] Disable config.file hooks in service.running Follow-up to 14aa73e1ab709c11f8af57d21d93ce6129b4fff7, do not indirectly include config file management with requirements. Signed-off-by: Georg Pfuetzenreuter --- apache/service/running.sls | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/apache/service/running.sls b/apache/service/running.sls index 6430382..ee03ccf 100644 --- a/apache/service/running.sls +++ b/apache/service/running.sls @@ -2,20 +2,14 @@ # vim: ft=sls {%- set tplroot = tpldir.split('/')[0] %} -{%- set sls_config_file = tplroot ~ '.config.file' %} {%- from tplroot ~ "/map.jinja" import apache with context %} -include: - - {{ sls_config_file }} - apache-service-running: {%- if salt['pillar.get']('apache:manage_service_states', True) %} {# By default run apache service states (unless pillar is false) #} service.running: - name: {{ apache.service.name }} - enable: True - - watch: - - sls: {{ sls_config_file }} - retry: {{ apache.retry_option|json }} cmd.run: - names: @@ -39,10 +33,7 @@ apache-service-running-restart: - cmd: {{ apache.custom_reload_command|default('apachectl graceful') }} - python_shell: True {%- endif %} - - watch: - - sls: {{ sls_config_file }} - require: - - sls: {{ sls_config_file }} - service: apache-service-running apache-service-running-reload: @@ -55,8 +46,5 @@ apache-service-running-reload: - cmd: {{ apache.custom_reload_command|default('apachectl graceful') }} - python_shell: True {%- endif %} - - watch: - - sls: {{ sls_config_file }} - require: - - sls: {{ sls_config_file }} - service: apache-service-running