move all files to explicit new-style module/ paths

[dsa-puppet.git] / modules / nagios / manifests / server.pp

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 3ee3020d209b8cd2afb6ed28b7d62105023b4a34..6f90533c759e586e9934dd7e21f62bc7fc7ff9f4 100644 (file)
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -8,16 +8,16 @@ class nagios::server inherits nagios::client {
 
        file {
                "/etc/nagios-plugins/config/local-dsa-checkcommands.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/checkcommands.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/checkcommands.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
 
                "/etc/nagios3/cgi.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/cgi.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/cgi.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/nagios.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/nagios.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/nagios.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
 
@@ -27,48 +27,48 @@ class nagios::server inherits nagios::client {
                        ensure  => directory;
 
                "/etc/nagios3/puppetconf.d/contacts.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/contacts.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/contacts.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/generic-host.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-host.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-host.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/generic-service.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-service.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-service.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/timeperiods.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
 
                "/etc/nagios3/puppetconf.d/auto-dependencies.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-dependencies.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-dependencies.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/auto-hostgroups.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostgroups.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hostgroups.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/auto-hosts.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hosts.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hosts.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/auto-servicegroups.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-servicegroups.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-servicegroups.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];
                "/etc/nagios3/puppetconf.d/auto-services.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-services.cfg" ],
+                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-services.cfg" ],
                        require => Package["nagios3"],
                        notify  => Exec["nagios3 reload"];