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 - - AllowOverride FileInfo - 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 @@ + + AllowOverride FileInfo + 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: } }