diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-17 21:54:43 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-17 21:54:43 -0200 |
| commit | e87974d37018b7ab8cf422a0797644c20e84e0c6 (patch) | |
| tree | f356efc902b44e9d39efe06f8c7284b4fbb729a3 /manifests/vserver.pp | |
| parent | f9096cf9a0115d47755c1eb5421efe1885b4f8fc (diff) | |
| parent | 711a471ae8c77f0fce3f05dd57ebd308d0144f57 (diff) | |
| download | puppet-virtual-e87974d37018b7ab8cf422a0797644c20e84e0c6.tar.gz puppet-virtual-e87974d37018b7ab8cf422a0797644c20e84e0c6.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/module_virtual
Conflicts:
manifests/vserver.pp
Diffstat (limited to 'manifests/vserver.pp')
| -rw-r--r-- | manifests/vserver.pp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/vserver.pp b/manifests/vserver.pp index 4d40b64..8f7437c 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -38,7 +38,7 @@ 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]]; @@ -53,7 +53,7 @@ class vserver::host { # 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; } @@ -77,15 +77,15 @@ class vserver::host { default: { file { "/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; } } |