aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-11-23 14:32:58 -0500
committerMicah Anderson <micah@riseup.net>2009-11-23 14:32:58 -0500
commit4ee9ad3eb779219103a4f9b746bf11ee3df7c5c6 (patch)
tree3013ee109282c694db6bb27b10af98509ed4cf4c
parent2ef0291b94715553747c51647a0ac2b0f930b92d (diff)
downloadpuppet-virtual-4ee9ad3eb779219103a4f9b746bf11ee3df7c5c6.tar.gz
puppet-virtual-4ee9ad3eb779219103a4f9b746bf11ee3df7c5c6.tar.bz2
switch source lines to get in-line with 0.25 pathing changes
-rw-r--r--manifests/openvpn.pp4
-rw-r--r--manifests/vserver.pp8
-rw-r--r--manifests/xen.pp14
3 files changed, 13 insertions, 13 deletions
diff --git a/manifests/openvpn.pp b/manifests/openvpn.pp
index d4589ef..7745d38 100644
--- 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 616631d..2d85984 100644
--- 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 6e2ea4c..301b316 100644
--- 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;
}