wiki -> hiera role; explicitly include apache2

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

diff --git a/modules/roles/manifests/buildd_master.pp b/modules/roles/manifests/buildd_master.pp
index e431acc..d4d163c 100644 (file)
--- a/modules/roles/manifests/buildd_master.pp
+++ b/modules/roles/manifests/buildd_master.pp
@@ -1,9 +1,11 @@
 class roles::buildd_master {
-       ssl::service { 'buildd.debian.org':
-               notify => Service['apache2'],
-       }
+  ssl::service { 'buildd.debian.org':
+    notify  => Exec['service apache2 reload'],
+    key => true,
+  }
 
-       file { '/etc/ssh/userkeys/wb-buildd.TEST':
-               content => template('roles/buildd_master_wb-authorized_keys.erb'),
-       }
+  ssh::authorized_key_collect { 'buildd-master':
+    target_user => 'wb-buildd',
+    collect_tag => 'buildd_master',
+  }
 }