saltstack-formulas/apache-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/apache-formula.git synced 2025-04-17 10:10:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(apache.service.running): prevent recursive requisite

Browse source
This commit is contained in:
Alexander Weidinger 2024-03-21 22:45:22 +01:00
parent 1553a9d5bc
commit 5338e8cbdb
2 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apache/config/file.sls
View file

@ -19,7 +19,7 @@ apache-config-file-directory-logdir:
- makedirs: True
- require:
- sls: {{ sls_package_install }}
- require_in:
- watch_in:
- service: apache-service-running
apache-config-file-directory-vhostdir:
@ -28,7 +28,7 @@ apache-config-file-directory-vhostdir:
- makedirs: True
- require:
- sls: {{ sls_package_install }}
- require_in:
- watch_in:
- service: apache-service-running
apache-config-file-directory-moddir:
@ -37,7 +37,7 @@ apache-config-file-directory-moddir:
- makedirs: True
- require:
- sls: {{ sls_package_install }}
- require_in:
- watch_in:
- service: apache-service-running
{%- if apache.davlockdbdir %}
@ -53,7 +53,7 @@ apache-config-file-directory-davlockdbdir:
- group
- require:
- sls: {{ sls_package_install }}
- require_in:
- watch_in:
- service: apache-service-running
{%- endif %}
@ -65,7 +65,7 @@ apache-config-file-directory-sites-enabled:
- makedirs: True
- require:
- sls: {{ sls_package_install }}
- require_in:
- watch_in:
- service: apache-service-running
{%- endif %}
@ -77,7 +77,7 @@ apache-config-file-directory-conf-enabled:
- makedirs: True
- require:
- sls: {{ sls_package_install }}
- require_in:
- watch_in:
- service: apache-service-running
{%- endif %}
@ -111,7 +111,7 @@ apache-config-file-managed-{{ grains.os }}-env:
- template: {{ apache.get('template_engine', 'jinja') }}
- context:
apache: {{ apache | json }}
- require_in:
- watch_in:
- file: apache-config-file-managed-{{ grains.os }}-ports
apache-config-file-managed-{{ grains.os }}-ports:
@ -158,6 +158,4 @@ apache-config-file-managed-skip:
- sls: {{ sls_package_install }}
- watch_in:
- module: apache-service-running-restart
- require_in:
- module: apache-service-running-restart
- service: apache-service-running

12
apache/service/running.sls
View file

@ -16,8 +16,6 @@ apache-service-running:
service.running:
- name: {{ apache.service.name }}
- enable: True
- watch:
- sls: {{ sls_config_file }}
- retry: {{ apache.retry_option|json }}
cmd.run:
- names:
@ -41,10 +39,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 }}
- after:
- service: apache-service-running
apache-service-running-reload:
@ -57,8 +52,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 }}
- after:
- service: apache-service-running