switch source lines to get in-line with 0.25 pathing changes

diff --git a/manifests/openvpn.pp b/manifests/openvpn.pp
index d4589ef225ecb03268c067fc4584fd665f3131fa..7745d38f1aa5c9ee74b611d15e7aacc597c6a239 100644 (file)
--- a/manifests/openvpn.pp
+++ b/manifests/openvpn.pp
@@ -14,10 +14,10 @@ class virtual::openvpn::base {
 class virtual::openvpn::host_base inherits virtual::openvpn::base {
        file {
                "/var/lib/puppet/modules/virtual/openvpn/create_interface":
-                       source => "puppet://$servername/virtual/create_openvpn_interface",
+                       source => "puppet://$server/modules/virtual/create_openvpn_interface",
                        mode => 0755, owner => root, group => 0;
                "/var/lib/puppet/modules/virtual/openvpn/destroy_interface":
-                       source => "puppet://$servername/virtual/destroy_openvpn_interface",
+                       source => "puppet://$server/modules/virtual/destroy_openvpn_interface",
                        mode => 0755, owner => root, group => 0;
        }
 }

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 616631dd0cab55afb6aa0409e2fdbeee9068bf2d..2d8598480f45561cbb742484b30154a6ad66e20f 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -34,7 +34,7 @@ class vserver::host {
       require => File["/etc/vservers"];
 
     "/usr/local/bin/build_vserver":
-      source => "puppet://$server/virtual/vserver/build_vserver",
+      source => "puppet://$server/modules/virtual/vserver/build_vserver",
       mode => 0755, owner => root, group => root,
       require => [ Package['util-vserver'], Package[debootstrap]];
 
@@ -58,15 +58,15 @@ class vserver::host {
       mode => 0644, owner => root, group => root;
         
     "/usr/local/share/munin-plugins/vserver_resources":
-      source => "puppet://$server/virtual/munin/vserver_resources",
+      source => "puppet://$server/modules/virtual/munin/vserver_resources",
       mode => 0755, owner => root, group => root;
     
     "/usr/local/share/munin-plugins/vserver_cpu_":
-      source => "puppet://$server/virtual/munin/vserver_cpu_",
+      source => "puppet://$server/modules/virtual/munin/vserver_cpu_",
       mode => 0755, owner => root, group => root;
     
     "/usr/local/share/munin-plugins/vserver_loadavg":
-      source => "puppet://$server/virtual/munin/vserver_loadavg",
+      source => "puppet://$server/modules/virtual/munin/vserver_loadavg",
       mode => 0755, owner => root, group => root;
   }
   

diff --git a/manifests/xen.pp b/manifests/xen.pp
index 6e2ea4c56e47a947cdb6fc0b66b0c40fdfef5029..301b3160faa5987e170885ecbeb3b90ca5ab32ae 100644 (file)
--- a/manifests/xen.pp
+++ b/manifests/xen.pp
@@ -5,10 +5,10 @@
 class munin::plugins::xen {
        munin::remoteplugin {
                xen_mem:        
-                       source => "puppet://$server/virtual/munin/xen_mem",
+                       source => "puppet://$server/modules/virtual/munin/xen_mem",
                        config => "user root";
                xen_vm:
-                       source => "puppet://$server/virtual/munin/xen_vm",
+                       source => "puppet://$server/modules/virtual/munin/xen_vm",
                        config => "user root";
        }
 }
@@ -46,9 +46,9 @@ class xen::domain::base {
                     "puppet://$server/files/virtual/xen/config/${operatingsystem}/xend-config.sxp",
                     "puppet://$server/files/virtual/xen/config/${operatingsystem}/$lsbdistcodename/xend-config.sxp",
                     "puppet://$server/files/virtual/xen/config/xend-config.sxp",
-                    "puppet://$server/virtual/xen/config/${operatingsystem}/xend-config.sxp",
-                    "puppet://$server/virtual/xen/config/${operatingsystem}/$lsbdistcodename/xend-config.sxp",
-                    "puppet://$server/virtual/xen/config/xend-config.sxp" ],
+                    "puppet://$server/modules/virtual/xen/config/${operatingsystem}/xend-config.sxp",
+                    "puppet://$server/modules/virtual/xen/config/${operatingsystem}/$lsbdistcodename/xend-config.sxp",
+                    "puppet://$server/modules/virtual/xen/config/xend-config.sxp" ],
         notify => Service['xend'],
         owner => root, group => 0, mode => 0644;
     }
@@ -64,13 +64,13 @@ class xen::domain::centos inherits xen::domain::base {
     }
 
     file{'/etc/sysconfig/xend':
-        source => "puppet://$server/virtual/xen/${operatingsystem}/sysconfig/xend",
+        source => "puppet://$server/modules/virtual/xen/${operatingsystem}/sysconfig/xend",
         notify => Service['xend'],
         owner => root, group => 0, mode => 0644;
     }
 
     file{'/etc/sysconfig/xendomains':
-        source => "puppet://$server/virtual/xen/${operatingsystem}/sysconfig/xendomains",
+        source => "puppet://$server/modules/virtual/xen/${operatingsystem}/sysconfig/xendomains",
         owner => root, group => 0, mode => 0644;
     }