ftp-master as historical_master (part of RT#7644)

[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..07d85e0 100644 (file)
--- 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,
+  }
 }