X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=7393260ea08bec1d433e849a4435b88b4ae3fe80;hb=477a3c8908203389736d455bc17a7952ee296073;hp=e16e20f850707f648b7e2ac3c93b64b5d40127e2;hpb=7f86914b9cb237cb1cf8c720f86902bef717cfaa;p=mirror%2Fdsa-puppet.git diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp index e16e20f85..7393260ea 100644 --- a/modules/nagios/manifests/client.pp +++ b/modules/nagios/manifests/client.pp @@ -6,16 +6,16 @@ class nagios::client inherits nagios { file { "/etc/default/nagios-nrpe-server": - source => [ "puppet:///nagios/per-host/$fqdn/default", - "puppet:///nagios/common/default" ], + source => [ "puppet:///modules/nagios/per-host/$fqdn/default", + "puppet:///modules/nagios/common/default" ], require => Package["nagios-nrpe-server"], notify => Exec["nagios-nrpe-server restart"]; "/etc/default/nagios-nrpe": ensure => absent, notify => Exec["nagios-nrpe-server restart"]; "/etc/nagios/nrpe.cfg": - source => [ "puppet:///nagios/per-host/$fqdn/nrpe.cfg", - "puppet:///nagios/common/nrpe.cfg" ], + source => [ "puppet:///modules/nagios/per-host/$fqdn/nrpe.cfg", + "puppet:///modules/nagios/common/nrpe.cfg" ], require => Package["nagios-nrpe-server"], notify => Exec["nagios-nrpe-server restart"]; "/etc/nagios/nrpe.d": @@ -27,13 +27,13 @@ class nagios::client inherits nagios { require => Package["nagios-nrpe-server"], notify => Exec["nagios-nrpe-server restart"]; "/etc/nagios/nrpe.d/nrpe_dsa.cfg": - source => [ "puppet:///nagios/dsa-nagios/generated/nrpe_dsa.cfg" ], + source => [ "puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg" ], require => Package["dsa-nagios-checks"], notify => Exec["nagios-nrpe-server restart"]; "/etc/nagios/obsolete-packages-ignore": - source => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore", - "puppet:///nagios/common/obsolete-packages-ignore" ], + source => [ "puppet:///modules/nagios/per-host/$fqdn/obsolete-packages-ignore", + "puppet:///modules/nagios/common/obsolete-packages-ignore" ], require => Package["dsa-nagios-checks"]; "/etc/nagios/obsolete-packages-ignore.d/hostspecific":