Merge branch 'master' of https://bitbucket.org/tmakinen/puppet

wiki/files/moin-httpd.conf

@@ -1,3 +1,3 @@
-<Directory "/srv/www/https/*/moin_static">
+<Directory "/srv/www/https/*/moin_static*">
   AllowOverride FileInfo
 </Directory>

wiki/manifests/init.pp

@@ -140,7 +140,11 @@ class wiki::collab inherits wiki::graphingwiki::common {
 #       Directory for wiki data. Defaults to /srv/wikis.
 #
 #   $collab_webhosts:
-#       List of collab virtual hosts. Defaults to [ "$homename" ].
+#       List of collab virtual hosts.
+#
+#   $collab_webroot:
+#       Path to collab in webserver document root.
+#       Defaults to "/srv/www/https/*/collab".
 #
 #   $collab_jabberdomain:
 #       Domain for jabber extauth.
@@ -324,13 +328,13 @@ class wiki::collab::base {
         before  => Exec["collab-create collab collab"],
     }
 
-    if !$wiki_collab_fqdn {
-        $wiki_collab_fqdn = $homename
+    if !$collab_webroot {
+        $collab_webroot = "/srv/www/https/*/collab"
     }
 
     apache::configfile { "collab.conf":
         http    => false,
-        source => "puppet:///modules/wiki/collab-httpd.conf",
+        content => template("wiki/collab-httpd.conf.erb"),
     }
 
     exec { "collab-create collab collab":

wiki/templates/collab-httpd.conf.erb

@@ -1,4 +1,4 @@
-<Directory "/srv/www/https/*/collab">
+<Directory "<%= collab_webroot %>">
   Options +ExecCGI
   AllowOverride All
 </Directory>