saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify service management

Browse Source 
In our environment a simple state ensuring the service is running and
having it reload on configuration changes should be more than
sufficient. Additionally, remove restart retries and useless log/config
dumping on failures.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
Georg Pfuetzenreuter 2023-04-29 23:28:49 +02:00
parent b22a6cf1bb
commit e1685ffbeb
Signed by: Georg
GPG Key ID: 1ED2F138E7E6FF57
2 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apache/config/vhosts/standard.sls
View File

@ -30,10 +30,6 @@ apache-config-vhosts-standard-{{ id }}:
- require: - require:
- pkg: apache-package-install-pkg-installed - pkg: apache-package-install-pkg-installed
- watch_in: - watch_in:
- module: apache-service-running-reload
- require_in:
- module: apache-service-running-restart
- module: apache-service-running-reload
- service: apache-service-running - service: apache-service-running
{%- if site.get('DocumentRoot') != False %} {%- if site.get('DocumentRoot') != False %}
@ -57,10 +53,6 @@ apache-config-vhosts-standard-{{ id }}-cmd-run-a2en:
- require: - require:
- file: apache-config-vhosts-standard-{{ id }} - file: apache-config-vhosts-standard-{{ id }}
- watch_in: - watch_in:
- module: apache-service-running-reload
- require_in:
- module: apache-service-running-restart
- module: apache-service-running-reload
- service: apache-service-running - service: apache-service-running
{%- else %} {%- else %}
@ -72,10 +64,6 @@ apache-config-vhosts-standard-{{ id }}-cmd-run-a2dis:
- require: - require:
- file: apache-config-vhosts-standard-{{ id }} - file: apache-config-vhosts-standard-{{ id }}
- watch_in: - watch_in:
- module: apache-service-running-reload
- require_in:
- module: apache-service-running-restart
- module: apache-service-running-reload
- service: apache-service-running - service: apache-service-running
{%- endif %} {%- endif %}

38
apache/service/running.sls
View File

@ -5,46 +5,12 @@
{%- from tplroot ~ "/map.jinja" import apache with context %} {%- from tplroot ~ "/map.jinja" import apache with context %}
apache-service-running: apache-service-running:
{%- if salt['pillar.get']('apache:manage_service_states', True) %}
{# By default run apache service states (unless pillar is false) #}
service.running: service.running:
- name: {{ apache.service.name }} - name: {{ apache.service.name }}
- enable: True - enable: True
- retry: {{ apache.retry_option|json }} - reload: True
cmd.run: cmd.run:
- names: - names:
- journalctl -xe -u {{ apache.service.name }} || tail -20 /var/log/messages || true - journalctl -xe -u {{ apache.service.name }} || true
- (service {{ apache.service.name }} restart && service {{ apache.service.name }} status) || true
- cat {{ apache.config }}
- onfail: - onfail:
- service: apache-service-running - service: apache-service-running
{%- endif %}
{# The following states are by default inert and can be used #}
{# by other states to trigger a restart or reload as needed. #}
apache-service-running-restart:
module.wait:
{%- if apache.service_state in ['running'] %}
- name: service.restart
- m_name: {{ apache.service.name }}
{%- else %}
- name: cmd.run
- cmd: {{ apache.custom_reload_command|default('apachectl graceful') }}
- python_shell: True
{%- endif %}
- require:
- service: apache-service-running
apache-service-running-reload:
module.wait:
{%- if apache.service_state in ['running'] %}
- name: service.reload
- m_name: {{ apache.service.name }}
{%- else %}
- name: cmd.run
- cmd: {{ apache.custom_reload_command|default('apachectl graceful') }}
- python_shell: True
{%- endif %}
- require:
- service: apache-service-running