put nagios cert onto nagios host by role
authorPeter Palfrader <peter@palfrader.org>
Wed, 1 Jan 2014 19:55:08 +0000 (20:55 +0100)
committerPeter Palfrader <peter@palfrader.org>
Wed, 1 Jan 2014 19:55:08 +0000 (20:55 +0100)
modules/roles/manifests/init.pp

index 1a282d8..28ea0ac 100644 (file)
@@ -10,9 +10,12 @@ class roles {
                include munin::master
        }
 
-       #if getfromhash($site::nodeinfo, 'nagiosmaster') {
+       if getfromhash($site::nodeinfo, 'nagiosmaster') {
        #       include nagios::server
-       #}
+               ssl::service { 'nagios.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
 
        if getfromhash($site::nodeinfo, 'buildd') {
                include buildd
@@ -130,12 +133,6 @@ class roles {
                }
        }
 
-       if $::hostname in [tchaikovsky] {
-               ssl::service { 'nagios.debian.org':
-                       notify => Service['apache2'],
-               }
-       }
-
        if $::hostname in [ullmann] {
                ssl::service { 'udd.debian.org':
                        notify => Service['apache2'],