diff options
| -rw-r--r-- | manifests/openvpn.pp | 4 | ||||
| -rw-r--r-- | manifests/vserver.pp | 10 | ||||
| -rw-r--r-- | manifests/xen.pp | 20 |
3 files changed, 17 insertions, 17 deletions
diff --git a/manifests/openvpn.pp b/manifests/openvpn.pp index 7745d38..5aa8d92 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://$server/modules/virtual/create_openvpn_interface", + source => "puppet:///modules/virtual/create_openvpn_interface", mode => 0755, owner => root, group => 0; "/var/lib/puppet/modules/virtual/openvpn/destroy_interface": - source => "puppet://$server/modules/virtual/destroy_openvpn_interface", + source => "puppet:///modules/virtual/destroy_openvpn_interface", mode => 0755, owner => root, group => 0; } } diff --git a/manifests/vserver.pp b/manifests/vserver.pp index 4a49268..9e1566d 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -34,14 +34,14 @@ class vserver::host { require => File["/etc/vservers"]; "/usr/local/bin/build_vserver": - source => "puppet://$server/modules/virtual/vserver/build_vserver", + source => "puppet:///modules/virtual/vserver/build_vserver", mode => 0755, owner => root, group => root, require => [ Package['util-vserver'], Package[debootstrap]]; # perhaps we should use hashify. # but i'm commenting this out until we learn how to properly use in case we want to use it. #"/etc/cron.daily/vserver-hashify": - # source => "puppet://$server/virtual/hashify.cron.daily", + # source => "puppet:///virtual/hashify.cron.daily", # mode => 0755, owner => root, group => root; } @@ -58,15 +58,15 @@ class vserver::host { mode => 0644, owner => root, group => root; "/usr/local/share/munin-plugins/vserver_resources": - source => "puppet://$server/modules/virtual/munin/vserver_resources", + source => "puppet:///modules/virtual/munin/vserver_resources", mode => 0755, owner => root, group => root; "/usr/local/share/munin-plugins/vserver_cpu_": - source => "puppet://$server/modules/virtual/munin/vserver_cpu_", + source => "puppet:///modules/virtual/munin/vserver_cpu_", mode => 0755, owner => root, group => root; "/usr/local/share/munin-plugins/vserver_loadavg": - source => "puppet://$server/modules/virtual/munin/vserver_loadavg", + source => "puppet:///modules/virtual/munin/vserver_loadavg", mode => 0755, owner => root, group => root; } diff --git a/manifests/xen.pp b/manifests/xen.pp index de07f19..7c06147 100644 --- a/manifests/xen.pp +++ b/manifests/xen.pp @@ -5,10 +5,10 @@ class munin::plugins::xen { munin::remoteplugin { xen_mem: - source => "puppet://$server/modules/virtual/munin/xen_mem", + source => "puppet:///modules/virtual/munin/xen_mem", config => "user root"; xen_vm: - source => "puppet://$server/modules/virtual/munin/xen_vm", + source => "puppet:///modules/virtual/munin/xen_vm", config => "user root"; } } @@ -41,12 +41,12 @@ class xen::domain::base { } file{'/etc/xen/xend-config.sxp': - source => [ "puppet://$server/modules/site-virtual/xen/${fqdn}/config/xend-config.sxp", - "puppet://$server/modules/site-virtual/xen/config/${domain}/xend-config.sxp", - "puppet://$server/modules/site-virtual/xen/config/${operatingsystem}/xend-config.sxp", - "puppet://$server/modules/site-virtual/xen/config/xend-config.sxp", - "puppet://$server/modules/virtual/xen/config/${operatingsystem}/xend-config.sxp", - "puppet://$server/modules/virtual/xen/config/xend-config.sxp" ], + source => [ "puppet:///modules/site-virtual/xen/${fqdn}/config/xend-config.sxp", + "puppet:///modules/site-virtual/xen/config/${domain}/xend-config.sxp", + "puppet:///modules/site-virtual/xen/config/${operatingsystem}/xend-config.sxp", + "puppet:///modules/site-virtual/xen/config/xend-config.sxp", + "puppet:///modules/virtual/xen/config/${operatingsystem}/xend-config.sxp", + "puppet:///modules/virtual/xen/config/xend-config.sxp" ], notify => Service['xend'], owner => root, group => 0, mode => 0644; } @@ -62,13 +62,13 @@ class xen::domain::centos inherits xen::domain::base { } file{'/etc/sysconfig/xend': - source => "puppet://$server/modules/virtual/xen/${operatingsystem}/sysconfig/xend", + source => "puppet:///modules/virtual/xen/${operatingsystem}/sysconfig/xend", notify => Service['xend'], owner => root, group => 0, mode => 0644; } file{'/etc/sysconfig/xendomains': - source => "puppet://$server/modules/virtual/xen/${operatingsystem}/sysconfig/xendomains", + source => "puppet:///modules/virtual/xen/${operatingsystem}/sysconfig/xendomains", owner => root, group => 0, mode => 0644; } |