Moved apache-reload and apache-restart commands to init.sls and invoke apache-reload from standard.sls

apache/debian_full.sls

@@ -21,14 +21,12 @@ a2dissite 000-default:
     - require:
       - pkg: apache
 
-apache-reload:
+extend:
-  cmd.wait:
+  apache-reload:
-    - name: service apache2 reload
     - order: 420
 
-apache-restart:
+extend:
-  cmd.wait:
+  apache-restart:
-    - name: service apache2 restart
     - order: 425
 
 /etc/apache2/sites-available/default:

apache/init.sls

@@ -8,3 +8,12 @@ apache:
     - running
     - name: {{ apache.service }}
     - enable: True
+
+apache-reload:
+  cmd.wait:
+    - name: service apache2 reload
+
+apache-restart:
+  cmd.wait:
+    - name: service apache2 restart
+

apache/vhosts/standard.sls

@@ -18,7 +18,7 @@ include:
     - require:
       - pkg: apache
     - watch_in:
-      - service: apache
+      - cmd: apache-reload
 
 {% if grains.os_family == 'Debian' %}
 a2ensite {{ id }}:
@@ -26,6 +26,8 @@ a2ensite {{ id }}:
     - run
     - require:
       - file: {{ id }}
+    - watch_in:
+      - cmd: apache-reload
 {% endif %}
 
 {% endfor %}