start using nagios::server again, move cert setup there

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 314dfb0..ab58405 100644 (file)
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -1,4 +1,9 @@
 class nagios::server {
+       ssl::service { 'nagios.debian.org':
+               notify  => Exec['service apache2 reload'],
+               key => true,
+       }
+
        concat::fragment { 'dsa-puppet-stuff--nagios--restart-stale-icinga':
                target => '/etc/cron.d/dsa-puppet-stuff',
                order  => '010',

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 864eb49..e6d6d06 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -17,11 +17,7 @@ class roles {
        }
 
        if has_role('nagiosmaster') {
-       #       include nagios::server
-               ssl::service { 'nagios.debian.org':
-                       notify  => Exec['service apache2 reload'],
-                       key => true,
-               }
+               include nagios::server
        }
 
        # XXX: turn this into a real role