nm.d.o no longer needs access to projectb on bmdb1

[mirror/dsa-puppet.git] / modules / roles / manifests / dgit_browse.pp

diff --git a/modules/roles/manifests/dgit_browse.pp b/modules/roles/manifests/dgit_browse.pp
index eb463fb..ab29f04 100644 (file)
--- a/modules/roles/manifests/dgit_browse.pp
+++ b/modules/roles/manifests/dgit_browse.pp
@@ -1,24 +1,26 @@
 class roles::dgit_browse {
-       ssl::service { 'browse.dgit.debian.org':
-               notify => Service['apache2'],
-               tlsaport => [],
-       }
+  include apache2
+  include roles::dgit_sync_target
 
-       package { 'cgit': ensure => installed, }
-       package { 'python-pygments': ensure => installed, }
-       package { 'python-chardet': ensure => installed, }
+  ssl::service { 'browse.dgit.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 
-       file { '/etc/cgitrc':
-               source => 'puppet:///modules/roles/dgit/cgitrc',
-       }
-       file { '/etc/apache2/conf-enabled/cgit.conf':
-               ensure => absent,
-               notify => Service['apache2'],
-       }
+  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',
+  }
 }