Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index bb9e81b..048ce4e 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -55,15 +55,19 @@ class ferm {
        }
        file { '/etc/ferm/ferm.conf':
                source  => 'puppet:///modules/ferm/ferm.conf',
+               notify  => Service['ferm'],
        }
        file { '/etc/ferm/conf.d/me.conf':
                content => template('ferm/me.conf.erb'),
+               notify  => Service['ferm'],
        }
        file { '/etc/ferm/conf.d/defs.conf':
                content => template('ferm/defs.conf.erb'),
+               notify  => Service['ferm'],
        }
        file { '/etc/ferm/conf.d/interfaces.conf':
                content => template('ferm/interfaces.conf.erb'),
+               notify  => Service['ferm'],
        }
        file { '/etc/logrotate.d/ulogd':
                source  => 'puppet:///modules/ferm/logrotate-ulogd',
@@ -74,6 +78,7 @@ class ferm {
        if getfromhash($site::nodeinfo, 'buildd') {
                file { '/etc/ferm/conf.d/load_ftp_conntrack.conf':
                        source => 'puppet:///modules/ferm/conntrack_ftp.conf',
+                       notify  => Service['ferm'],
                }
        }
 

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 7b8927d..7479403 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -42,16 +42,20 @@ class nagios::client inherits nagios {
        }
        file { '/etc/nagios/nrpe.cfg':
                content => template('nagios/nrpe.cfg.erb'),
+               notify  => Service['nagios-nrpe-server'],
        }
        file { '/etc/nagios/nrpe.d':
                ensure  => directory,
                mode    => '0755',
+               notify  => Service['nagios-nrpe-server'],
        }
        file { '/etc/nagios/nrpe.d/debianorg.cfg':
                content => template('nagios/inc-debian.org.erb'),
+               notify  => Service['nagios-nrpe-server'],
        }
        file { '/etc/nagios/nrpe.d/nrpe_dsa.cfg':
                source  => 'puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg',
+               notify  => Service['nagios-nrpe-server'],
        }
        file { '/etc/nagios/obsolete-packages-ignore':
                source  => 'puppet:///modules/nagios/common/obsolete-packages-ignore',

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 666faad..302a4db 100644 (file)
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -29,47 +29,62 @@ class nagios::server {
        }
        file { '/etc/nagios-plugins/config/local-dsa-checkcommands.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/static/checkcommands.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios-plugins/config/local-dsa-eventhandlers.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/static/eventhandlers.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/cgi.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/static/cgi.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/nagios.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/static/nagios.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/puppetconf.d/contacts.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/contacts.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/puppetconf.d/generic-host.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-host.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/puppetconf.d/generic-service.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-service.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/puppetconf.d/timeperiods.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/timeperiods.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/puppetconf.d/auto-dependencies.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-dependencies.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hostextinfo.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/puppetconf.d/auto-hostgroups.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hostgroups.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/puppetconf.d/auto-hosts.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hosts.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-serviceextinfo.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/puppetconf.d/auto-servicegroups.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-servicegroups.cfg',
+               notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/puppetconf.d/auto-services.cfg':
                source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-services.cfg',
+               notify  => Service['nagios3'],
        }
 }