Merge remote-tracking branch 'origin/master' into staging

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

diff --git a/modules/roles/manifests/planet_master.pp b/modules/roles/manifests/planet_master.pp
index 5114ece..8e67d46 100644 (file)
--- a/modules/roles/manifests/planet_master.pp
+++ b/modules/roles/manifests/planet_master.pp
@@ -1,10 +1,10 @@
 class roles::planet_master {
        include apache2::ssl
        apache2::config { 'puppet-debianhosts':
-               content => template('roles/conf-debianhostlist.erb'),
+               ensure => 'absent',
        }
        apache2::site { 'planet-master.debian.org':
-               source => 'puppet:///modules/roles/planet_master/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'],