X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fplanet_master.pp;h=07d85e08442de7e7725f931b4806a192b112bdac;hb=cf760168ec022b1fc8edb9c46d85b29a98af8ca6;hp=5114ece7504806e7df94fd493d439acff00d847e;hpb=52933eba54eaa5684108bf2f9aeaf63c2b7a0690;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/planet_master.pp b/modules/roles/manifests/planet_master.pp
index 5114ece75..07d85e084 100644
--- a/modules/roles/manifests/planet_master.pp
+++ b/modules/roles/manifests/planet_master.pp
@@ -1,13 +1,14 @@
 class roles::planet_master {
-	include apache2::ssl
-	apache2::config { 'puppet-debianhosts':
-		content => template('roles/conf-debianhostlist.erb'),
-	}
-	apache2::site { 'planet-master.debian.org':
-		source => 'puppet:///modules/roles/planet_master/planet-master.debian.org',
-	}
-	ssl::service { 'planet-master.debian.org':
-		notify => Exec['service apache2 reload'],
-		key => true,
-	}
+  include apache2
+  include apache2::ssl
+  apache2::config { 'puppet-debianhosts':
+    ensure => 'absent',
+  }
+  apache2::site { 'planet-master.debian.org':
+    content => template('roles/planet_master/planet-master.debian.org.erb')
+  }
+  ssl::service { 'planet-master.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 }