From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 13 Jul 2015 06:30:15 +0000 (+0200)
Subject: Do not use site-wide cgit.conf
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=49ad7e47cba53df1e0ba379b5b65366cb4300d02;p=mirror%2Fdsa-puppet.git

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 51c9dfd16..148b767f6 100644
--- 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 8a9a8ff1a..fe06a31bb 100644
--- 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',