X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fdgit_browse.pp;h=9c7457c4a1e13b42a27f8f4114d58c4378fd2d8d;hb=81d30ab85281bca85a4b6d91723ac0a1a0157fa6;hp=8a9a8ff1ae694fc38474412c37131352afcb4e8e;hpb=cc1f913c285e3a03eed758c296fb5bb998faba10;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/dgit_browse.pp b/modules/roles/manifests/dgit_browse.pp
index 8a9a8ff1a..9c7457c4a 100644
--- a/modules/roles/manifests/dgit_browse.pp
+++ b/modules/roles/manifests/dgit_browse.pp
@@ -1,16 +1,17 @@
 class roles::dgit_browse {
-	#ssl::service { 'wiki.debian.org':
+	#ssl::service { 'browse.dgit.debian.org':
 	#	notify => Service['apache2'],
 	#}
-	#rsync::site { 'wiki':
-	#	source => 'puppet:///modules/roles/wiki/rsyncd.conf',
-	#}
 
 	package { 'cgit': ensure => installed, }
 
 	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',