From c4f7be837a4f97ee8152b551ca741c5bb5bc6924 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Sat, 23 Oct 2010 03:43:36 +0300
Subject: [PATCH] Fixed apache config on Debian/Ubuntu in puppet::server.

---
 puppet/manifests/init.pp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 0531754..821bf59 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -156,7 +156,19 @@ class puppet::server inherits puppet::client {
         ensure => installed,
     }
 
-    include apache::sslserver
+    case $operatingsystem {
+        debian,ubuntu: {
+            include apache::server
+            apache::a2enmod { "headers": }
+            apache::a2enmod { "proxy": }
+            apache::a2enmod { "proxy_balancer": }
+            apache::a2enmod { "proxy_http": }
+            apache::a2enmod { "ssl": }
+        }
+        default: {
+            include apache::sslserver
+        }
+    }
     apache::configfile { "puppet.conf":
         content => template("puppet/puppet-httpd.conf.erb"),
         http    => false,