From 7f50003a89f1618d6532a73ad64eb13fd74f9575 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Tue, 17 Jul 2012 17:14:48 +0300
Subject: [PATCH] Moved moin htdocs apache configs to separate file

---
 wiki/files/collab-httpd.conf | 3 ---
 wiki/files/moin-httpd.conf   | 3 +++
 wiki/manifests/init.pp       | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 wiki/files/moin-httpd.conf

diff --git a/wiki/files/collab-httpd.conf b/wiki/files/collab-httpd.conf
index 96300ca..9c519ce 100644
--- a/wiki/files/collab-httpd.conf
+++ b/wiki/files/collab-httpd.conf
@@ -2,6 +2,3 @@
   Options +ExecCGI
   AllowOverride All
 </Directory>
-<Directory "/srv/www/https/*/moin_static">
-  AllowOverride FileInfo
-</Directory>
diff --git a/wiki/files/moin-httpd.conf b/wiki/files/moin-httpd.conf
new file mode 100644
index 0000000..55c82d3
--- /dev/null
+++ b/wiki/files/moin-httpd.conf
@@ -0,0 +1,3 @@
+<Directory "/srv/www/https/*/moin_static">
+  AllowOverride FileInfo
+</Directory>
diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp
index 67a70e6..41783a4 100644
--- a/wiki/manifests/init.pp
+++ b/wiki/manifests/init.pp
@@ -368,6 +368,11 @@ class wiki::collab::base {
     }
 
     if $collab_webhosts {
+        apache::configfile { "moin.conf":
+            http   => false,
+            source => "puppet:///modules/wiki/moin-httpd.conf",
+        }
+
         configwebhost { $collab_webhosts: }
     }