From df4fd8526b01d01f2af9b708473552bdb386dabf Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Mon, 2 Nov 2009 00:50:59 +0100
Subject: update file path to new 0.25 style

---
 manifests/base.pp   | 10 +++++-----
 manifests/centos.pp |  6 +++---
 manifests/plugin.pp |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'manifests')

diff --git a/manifests/base.pp b/manifests/base.pp
index 48a6495..ad25536 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -30,8 +30,8 @@ class nagios::base {
       source => [ "puppet://$server/files/nagios/configs/${fqdn}/nagios.cfg",
                         "puppet://$server/files/nagios/configs/${operatingsystem}/nagios.cfg",
                         "puppet://$server/files/nagios/configs/nagios.cfg",
-                        "puppet://$server/nagios/configs/${operatingsystem}/nagios.cfg",
-                        "puppet://$server/nagios/configs/nagios.cfg" ],
+                        "puppet://$server/modules/nagios/configs/${operatingsystem}/nagios.cfg",
+                        "puppet://$server/modules/nagios/configs/nagios.cfg" ],
             notify => Service[nagios],
             mode => 0644, owner => root, group => root;
     }
@@ -40,8 +40,8 @@ class nagios::base {
         source => [ "puppet://$server/files/nagios/configs/${fqdn}/cgi.cfg",
                     "puppet://$server/files/nagios/configs/${operatingsystem}/cgi.cfg",
                     "puppet://$server/files/nagios/configs/cgi.cfg",
-                    "puppet://$server/nagios/configs/${operatingsystem}/cgi.cfg",
-                    "puppet://$server/nagios/configs/cgi.cfg" ],
+                    "puppet://$server/modules/nagios/configs/${operatingsystem}/cgi.cfg",
+                    "puppet://$server/modules/nagios/configs/cgi.cfg" ],
         owner => 'root',
         group => 0,
         mode => '0644',
@@ -51,7 +51,7 @@ class nagios::base {
     file {"/etc/nagios/htpasswd.users":
             source => [
                 "puppet://$server/files/nagios/htpasswd.users",
-                "puppet://$server/nagios/htpasswd.users" ],
+                "puppet://$server/modules/nagios/htpasswd.users" ],
             mode => 0640, owner => root, group => apache;
     }
     file{[ "/etc/nagios/nagios_command.cfg",
diff --git a/manifests/centos.pp b/manifests/centos.pp
index a5a96fb..6028f21 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -14,7 +14,7 @@ class nagios::centos inherits nagios::base {
         path => "/etc/nagios/commands.cfg",
         source => [ "puppet://$server/files/nagios/configs/${fqdn}/commands.cfg",
                     "puppet://$server/files/nagios/configs/${operatingsystem}/commands.cfg",
-                    "puppet://$server/nagios/configs/${operatingsystem}/commands.cfg" ],
+                    "puppet://$server/modules/nagios/configs/${operatingsystem}/commands.cfg" ],
         owner => 'root',
         group => 0,
         mode => '0644',
@@ -25,7 +25,7 @@ class nagios::centos inherits nagios::base {
         path => "/etc/nagios/localhost.cfg",
         source => [ "puppet://$server/files/nagios/configs/${fqdn}/localhost.cfg",
                     "puppet://$server/files/nagios/configs/${operatingsystem}/localhost.cfg",
-                    "puppet://$server/nagios/configs/${operatingsystem}/localhost.cfg" ],
+                    "puppet://$server/modules/nagios/configs/${operatingsystem}/localhost.cfg" ],
         owner => 'root',
         group => 0,
         mode => '0644',
@@ -40,7 +40,7 @@ class nagios::centos inherits nagios::base {
         mode => '0750', owner => root, group => nagios;
     }
     file{"/etc/nagios/private/resource.cfg":
-        source => "puppet://$server/nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}",
+        source => "puppet://$server/modules/nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}",
         notify => Service[nagios],
         owner => root, group => nagios, mode => '0640';
     }
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index eebc589..4789345 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -7,7 +7,7 @@ define nagios::plugin(
       default => "/usr/lib/nagios/plugins/$name",
     },
     ensure => $ensure,
-    source => "puppet://$server/nagios/plugins/$name",
+    source => "puppet://$server/modules/nagios/plugins/$name",
     require => Package['nagios-plugins'],
     owner => root, group => 0, mode => 0755;
   }
-- 
cgit v1.2.3