X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fbugs_mirror.pp;h=4a45d0e1d4e4d96055344fded3f7b86fd0048a60;hb=HEAD;hp=a30b05c8284469660035cc1494434f0bfa8f8d17;hpb=f071e2941f6102c1d083390e0fe9de716ce8d097;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/bugs_mirror.pp b/modules/roles/manifests/bugs_mirror.pp
index a30b05c82..4a45d0e1d 100644
--- a/modules/roles/manifests/bugs_mirror.pp
+++ b/modules/roles/manifests/bugs_mirror.pp
@@ -1,21 +1,19 @@
 class roles::bugs_mirror {
-	include apache2
+  include roles::bugs_web
 
-	rsync::site { 'bugs_mirror':
-		source      => 'puppet:///modules/roles/bugs_mirror/rsyncd.conf',
-		max_clients => 100,
-	}
+  rsync::site { 'bugs_mirror':
+    source      => 'puppet:///modules/roles/bugs_mirror/rsyncd.conf',
+    max_clients => 100,
+  }
 
-	if $::apache2 {
-		apache2::site { '009-bugs-mirror.debian.org':
-			site   => 'bugs-mirror.debian.org',
-			source => 'puppet:///modules/roles/bugs_mirror/bugs-mirror.debian.org',
-		}
-	}
+  apache2::site { '009-bugs-mirror.debian.org':
+    site   => 'bugs-mirror.debian.org',
+    source => 'puppet:///modules/roles/bugs_mirror/bugs-mirror.debian.org',
+  }
 
-	file { '/srv/bugs.debian.org/cache/libravatar':
-		ensure => directory,
-		owner  => 'www-data',
-		mode   => '0755',
-	}
+  file { '/srv/bugs.debian.org/cache/libravatar':
+    ensure => directory,
+    owner  => 'www-data',
+    mode   => '0755',
+  }
 }