Do not use site-wide cgit.conf

diff --git a/modules/roles/files/dgit/browse.dgit.debian.org b/modules/roles/files/dgit/browse.dgit.debian.org
index 51c9dfd160ccc72f325b9cb5f6b53dfe1d1a2077..148b767f6c2709275a8b16b6fba29b16d8e60d27 100644 (file)
--- a/modules/roles/files/dgit/browse.dgit.debian.org
+++ b/modules/roles/files/dgit/browse.dgit.debian.org
@@ -20,6 +20,7 @@
        <Directory "/usr/lib/cgit/">
                AllowOverride None
                Options ExecCGI FollowSymlinks
+               Require all granted
        </Directory>
 
        AddOutputFilterByType DEFLATE text/html text/plain text/xml text/x-js text/javascript text/css 

diff --git a/modules/roles/manifests/dgit_browse.pp b/modules/roles/manifests/dgit_browse.pp
index 8a9a8ff1ae694fc38474412c37131352afcb4e8e..fe06a31bbd40001a4fee8a9c6fb0bb719d6eedc0 100644 (file)
--- a/modules/roles/manifests/dgit_browse.pp
+++ b/modules/roles/manifests/dgit_browse.pp
@@ -11,6 +11,10 @@ class roles::dgit_browse {
        file { '/etc/cgitrc':
                source => 'puppet:///modules/roles/dgit/cgitrc',
        }
+       file { '/etc/apache2/conf-enabled/cgit.conf':
+               ensure => absent,
+               notify => Service['apache2'],
+       }
 
        apache2::site { '010-browse.dgit.debian.org':
                site    => 'browse.dgit.debian.org',