X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdgit_browse.pp;h=ab29f0401d42dc13b27f94c936cce8a4bc58765f;hb=c744e409e7024a4c41238cc93d7f18e29ab667f6;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..ab29f0401 100644
--- a/modules/roles/manifests/dgit_browse.pp
+++ b/modules/roles/manifests/dgit_browse.pp
@@ -1,20 +1,26 @@
 class roles::dgit_browse {
-	#ssl::service { 'wiki.debian.org':
-	#	notify => Service['apache2'],
-	#}
-	#rsync::site { 'wiki':
-	#	source => 'puppet:///modules/roles/wiki/rsyncd.conf',
-	#}
+  include apache2
+  include roles::dgit_sync_target
 
-	package { 'cgit': ensure => installed, }
+  ssl::service { 'browse.dgit.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 
-	file { '/etc/cgitrc':
-		source => 'puppet:///modules/roles/dgit/cgitrc',
-	}
+  package { 'cgit': ensure => installed, }
+  package { 'python-pygments': ensure => installed, }
+  package { 'python-chardet': ensure => installed, }
 
-	apache2::site { '010-browse.dgit.debian.org':
-		site    => 'browse.dgit.debian.org',
-		source => 'puppet:///modules/roles/dgit/browse.dgit.debian.org',
-	}
+  file { '/etc/cgitrc':
+    source => 'puppet:///modules/roles/dgit/cgitrc',
+  }
+  file { '/etc/apache2/conf-enabled/cgit.conf':
+    ensure => absent,
+    notify => Exec['service apache2 reload'],
+  }
 
+  apache2::site { '010-browse.dgit.debian.org':
+    site   => 'browse.dgit.debian.org',
+    source => 'puppet:///modules/roles/dgit/browse.dgit.debian.org',
+  }
 }