apache/config/init.sls

@@ -2,4 +2,14 @@
 # vim: ft=sls
 
 include:
+  - .file
+  # .modules.clean  # disable (exclude from init state)
+  # .modules        # enable by default (read pillars)
+  # .debian_full
+  - .flags
+  - .logrotate
+  - .manage_security
+  - .no_default_vhost
+  # .own_default_vhost
+  - .register_site
   - .vhosts

apache/config/vhosts/standard.sls

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

apache/package/install.sls

@@ -4,7 +4,6 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import apache with context %}
 
-{#- consider moving this to an optional state or enabling it with a pillar option
     {%- if 'deps' in apache.pkg and apache.pkg.deps and apache.pkg.deps is iterable and apache.pkg.deps is not string %}
 apache-package-install-deps-pkg-installed:
   pkg.installed:
@@ -12,7 +11,6 @@ apache-package-install-deps-pkg-installed:
     - require:
       - apache-package-install-pkg-installed
     {%- endif %}
-#}
 
 apache-package-install-pkg-installed:
     {%- if grains.os_family == 'Windows' %}

apache/service/running.sls

@@ -2,10 +2,63 @@
 # vim: ft=sls
 
 {%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_config_file = tplroot ~ '.config.file' %}
+{%- set sls_config_registersite = tplroot ~ '.config.register_site' %}
 {%- from tplroot ~ "/map.jinja" import apache with context %}
 
+include:
+  - {{ sls_config_file }}
+  - {{ sls_config_registersite }}
+
 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
-    - reload: True
+    - watch:
+      - sls: {{ sls_config_file }}
+    - retry: {{ apache.retry_option|json }}
+  cmd.run:
+    - names:
+      - journalctl -xe -u {{ apache.service.name }} || tail -20 /var/log/messages || true
+      - (service {{ apache.service.name }} restart && service {{ apache.service.name }} status) || true
+      - cat {{ apache.config }}
+    - onfail:
+      - 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 %}
+    - watch:
+      - sls: {{ sls_config_file }}
+    - require:
+      - sls: {{ sls_config_file }}
+      - 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 %}
+    - watch:
+      - sls: {{ sls_config_file }}
+    - require:
+      - sls: {{ sls_config_file }}
+      - service: apache-service-running