From 7bd26f33d3b0c3cab58edd3c325e7ec29660d4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Wed, 24 Apr 2013 08:44:19 +0300
Subject: [PATCH] Fixed Apache module for Fedora 18 (eg. Apache 2.4 series).

---
 apache/files/emptysite/00-dummy.conf | 1 +
 apache/manifests/redhat.pp           | 4 ++--
 apache/templates/site.http.conf.erb  | 2 +-
 apache/templates/site.https.conf.erb | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 apache/files/emptysite/00-dummy.conf

diff --git a/apache/files/emptysite/00-dummy.conf b/apache/files/emptysite/00-dummy.conf
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/apache/files/emptysite/00-dummy.conf
@@ -0,0 +1 @@
+
diff --git a/apache/manifests/redhat.pp b/apache/manifests/redhat.pp
index 023efe5..11f89c7 100644
--- a/apache/manifests/redhat.pp
+++ b/apache/manifests/redhat.pp
@@ -109,7 +109,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
             force   => true,
             recurse => true,
             source  => [ "puppet:///files/apache/sites/${site_fqdn}",
-                         "puppet:///modules/custom/empty", ],
+                         "puppet:///modules/apache/emptysite", ],
             before  => File[$site_conf],
             notify  => Service["httpd"],
         }
@@ -322,7 +322,7 @@ define apache::redhat::sslsite($first, $ipaddr, $root,
         force   => true,
         recurse => true,
         source  => [ "puppet:///files/apache/sslsites/${site_fqdn}",
-                     "puppet:///modules/custom/empty", ],
+                     "puppet:///modules/apache/emptysite", ],
         before  => File[$site_conf],
         notify  => Service["httpsd"],
     }
diff --git a/apache/templates/site.http.conf.erb b/apache/templates/site.http.conf.erb
index 63cb94b..cc41510 100644
--- a/apache/templates/site.http.conf.erb
+++ b/apache/templates/site.http.conf.erb
@@ -6,5 +6,5 @@
   ErrorLog /srv/www/log/http/<%= site_fqdn %>/error_log
   CustomLog /srv/www/log/http/<%= site_fqdn %>/access_log combined
   DocumentRoot /srv/www/http/<%= site_fqdn %>
-  Include <%= site_confdir %>
+  Include <%= site_confdir %>/*.conf
 </VirtualHost>
diff --git a/apache/templates/site.https.conf.erb b/apache/templates/site.https.conf.erb
index 14f55be..967a84e 100644
--- a/apache/templates/site.https.conf.erb
+++ b/apache/templates/site.https.conf.erb
@@ -149,6 +149,6 @@ BrowserMatch "MSIE [2-5]" \
 #CustomLog logs/ssl_request_log \
 #          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 
-Include <%= site_confdir %>
+Include <%= site_confdir %>/*.conf
 
 </VirtualHost>