Updated Debian-family formula to work on all Debian-family OSes

apache/debian_full.sls

@@ -1,9 +1,10 @@
+{% if grains['os_family']=="Debian" %}
+
 include:
   - apt
   - apache
   - apache.register_site
 
-{% if grains['os']=="Ubuntu" %}
 extend:
   apache:
     pkg:
@@ -42,4 +43,4 @@ apache-restart:
     - require:
       - pkg: apache
 
-{% endif %} #END: os = ubuntu
+{% endif %} #END: os = debian

apache/fcgid.sls

@@ -1,8 +1,8 @@
+{% if grains['os_family']=="Debian" %}
+
 include:
   - apt
 
-{% if grains['os']=="Ubuntu" %}
-
 mod-fcgid:
   pkg.installed:
     - name: libapache2-mod-fcgid

apache/php5.sls

@@ -1,8 +1,8 @@
+{% if grains['os_family']=="Debian" %}
+
 include:
   - apt
 
-{% if grains['os']=="Ubuntu" %}
-
 mod-php5:
   pkg.installed:
     - name: libapache2-mod-php5

apache/register_site.sls

@@ -1,3 +1,5 @@
+{% if grains['os_family']=="Debian" %}
+
 {% if 'apache' in pillar and 'register-site' in pillar['apache'] %} #BEGIN: ['apache']['register-site']
 {% for site in pillar['apache']['register-site'] %}
 
@@ -44,3 +46,4 @@ a2dissite {{ pillar['apache']['register-site'][site]['name'] }}:
 
 {% endfor %}
 {% endif %} #END: apache-register-site
+{% endif %} #END: grains['os_family'] == debian

apache/rewrite.sls

@@ -1,8 +1,8 @@
+{% if grains['os_family']=="Debian" %}
+
 include:
   - apt
 
-{% if grains['os']=="Ubuntu" %}
-
 a2enmod rewrite:
   cmd.run:
     - unless: ls /etc/apache2/mods-enabled/rewrite.load