From c47ce1b533cc979b6b227f8a112b15f062ba3c45 Mon Sep 17 00:00:00 2001
From: Alan McNea <amcnea@dailyrx.com>
Date: Mon, 29 Jul 2013 21:30:29 +0000
Subject: [PATCH] Changed apache2 refs to apache

---
 fcgid.sls         |  4 ++--
 init.sls          | 16 ++++++++--------
 php5.sls          |  8 ++++----
 register_site.sls |  4 ++--
 rewrite.sls       |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/fcgid.sls b/fcgid.sls
index 1328b2b..895cffe 100644
--- a/fcgid.sls
+++ b/fcgid.sls
@@ -8,7 +8,7 @@ mod-fcgid:
     - name: libapache2-mod-fcgid
     - order: 180
     - require:
-      - pkg: apache2
+      - pkg: apache
 
 a2enmod fcgid:
   cmd.run:
@@ -17,6 +17,6 @@ a2enmod fcgid:
     - require: 
       - pkg: mod-fcgid
     - watch_in:
-      - cmd: apache2-restart
+      - cmd: apache-restart
 
 {% endif %}
diff --git a/init.sls b/init.sls
index a438e93..d30c86c 100644
--- a/init.sls
+++ b/init.sls
@@ -1,10 +1,10 @@
 include:
   - apt
-  - apache2.register_site
+  - apache.register_site
 
 {% if grains['os']=="Ubuntu" %}
 
-apache2:
+apache:
   pkg.installed:
     - name: apache2
     - order: 175
@@ -17,16 +17,16 @@ a2dissite 000-default:
     - order: 225
     - onlyif: ls /etc/apache2/sites-enabled/000-default
     - watch_in:
-      - cmd: apache2-reload
+      - cmd: apache-reload
     - require:
-      - pkg: apache2
+      - pkg: apache
 
-apache2-reload:
+apache-reload:
   cmd.wait:
     - name: service apache2 reload
     - order: 420
 
-apache2-restart:
+apache-restart:
   cmd.wait:
     - name: service apache2 restart
     - order: 425
@@ -35,12 +35,12 @@ apache2-restart:
   file.absent:
     - order: 230
     - require:
-      - pkg: apache2
+      - pkg: apache
 
 /etc/apache2/sites-available/default-ssl:
   file.absent:
     - order: 230
     - require:
-      - pkg: apache2
+      - pkg: apache
 
 {% endif %} #END: os = ubuntu
diff --git a/php5.sls b/php5.sls
index a35e239..fd045eb 100644
--- a/php5.sls
+++ b/php5.sls
@@ -8,7 +8,7 @@ mod-php5:
     - name: libapache2-mod-php5
     - order: 180
     - require:
-      - pkg: apache2
+      - pkg: apache
 
 a2enmod php5:
   cmd.run:
@@ -16,7 +16,7 @@ a2enmod php5:
     - require:
       - pkg: mod-php5
     - watch_in:
-      - cmd: apache2-restart
+      - cmd: apache-restart
 
 {% if 'apache2-php-ini' in pillar %}
 /etc/php5/apache2/php.ini:
@@ -24,9 +24,9 @@ a2enmod php5:
     - source: {{ pillar['apache2-php-ini'] }}
     - order: 225
     - watch_in:
-      - cmd: apache2-restart
+      - cmd: apache-restart
     - require:
-      - pkg: apache2
+      - pkg: apache
       - pkg: php5
 {% endif %}
 
diff --git a/register_site.sls b/register_site.sls
index 428b9d9..26d1f39 100644
--- a/register_site.sls
+++ b/register_site.sls
@@ -18,7 +18,7 @@ a2dissite {{ pillar['apache2-register-site'][site]['name'] }}:
 {% endif %}
     - order: 230
     - require:
-      - pkg: apache2
+      - pkg: apache
       - file: /etc/apache2/sites-available/{{ pillar['apache2-register-site'][site]['name'] }}
 
 {% endif %}
@@ -37,7 +37,7 @@ a2dissite {{ pillar['apache2-register-site'][site]['name'] }}:
     - mode: 775
     - watch_in:
       - cmd: a2ensite {{ pillar['apache2-register-site'][site]['name'] }}
-      - cmd: apache2-reload
+      - cmd: apache-reload
 
 {% endif %}
 ##########################################
diff --git a/rewrite.sls b/rewrite.sls
index fd85758..8e80faa 100644
--- a/rewrite.sls
+++ b/rewrite.sls
@@ -7,6 +7,6 @@ a2enmod rewrite:
   cmd.run:
     - unless: ls /etc/apache2/mods-enabled/rewrite.load
     - watch_in:
-      - cmd: apache2-restart
+      - cmd: apache-restart
 
 {% endif %}