Updated Debian-family formula to use main sls but keep custom ordering

2013-08-13 14:29:58 -06:00 · 2013-08-13 14:29:58 -06:00 · 746bbb9db3
commit 746bbb9db3
parent 053c3443d7
1 changed files with 7 additions and 9 deletions
--- a/apache/debian_full.sls
+++ b/apache/debian_full.sls
@ -1,17 +1,15 @@
 include:
  - apt
+  - apache
  - apache.register_site

 {% if grains['os']=="Ubuntu" %}
-
-apache:
-  pkg.installed:
-    - name: apache2
-    - order: 175
-  service.running:
-    - name: apache2
-    - enable: True
-    - order: 455
+extend:
+  apache:
+    pkg:
+      - order: 175
+    service:
+      - order: 455

 a2dissite 000-default:
  cmd.run: