diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-12-27 17:48:08 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-12-27 17:48:08 -0200 |
| commit | fb09f12c8a838372b64304fb40f047671e020d27 (patch) | |
| tree | fa3aa86c22a22347492c15abd1d3302ee322b3dc /manifests/vserver.pp | |
| parent | 615a9e08f69335d46695db4748725fcc5b4393b8 (diff) | |
| parent | 2163466a745fee4bb92d3e628343c2808dcf4bc3 (diff) | |
| download | puppet-virtual-fb09f12c8a838372b64304fb40f047671e020d27.tar.gz puppet-virtual-fb09f12c8a838372b64304fb40f047671e020d27.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 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/manifests/vserver.pp b/manifests/vserver.pp index 3609fb1..acd29f0 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]]; @@ -56,6 +56,7 @@ class vserver::host { "/etc/modprobe.d/local-dummy": ensure => absent, mode => 0644, owner => root, group => root; +<<<<<<< HEAD:manifests/vserver.pp } # Setup some plugins if munin is enabled in the system @@ -64,16 +65,16 @@ class vserver::host { default: { file { "/usr/local/share/munin-plugins/vserver_resources": - source => "puppet://$server/virtual/munin/vserver_resources", - mode => 0755, owner => root, group => root; + 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_", - mode => 0755, owner => root, group => root; + 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", - mode => 0755, owner => root, group => root; + source => "puppet://$server/modules/virtual/munin/vserver_loadavg", + mode => 0755, owner => root, group => root; } } } @@ -86,7 +87,7 @@ class vserver::host { munin::plugin { "vserver_loadavg": config => "user root\n", - script_path => "/usr/local/share/munin-plugins"; + script_path_in => "/usr/local/share/munin-plugins"; } # This creates a RSS graph for each vserver on the host (note after more than 4 vservers this can get noisy) @@ -94,7 +95,7 @@ class vserver::host { "vserver_resources_RSS": ensure => "vserver_resources", config => "user root\nenv.resource RSS", - script_path => "/usr/local/share/munin-plugins"; + script_path_in => "/usr/local/share/munin-plugins"; } # This creates a VM graph for each vserver on the host (note after more than 4 vservers this can get noisy) @@ -102,18 +103,17 @@ class vserver::host { "vserver_resources_VM": ensure => "vserver_resources", config => "user root\nenv.resource VM", - script_path => "/usr/local/share/munin-plugins"; + script_path_in => "/usr/local/share/munin-plugins"; } # This creates a VM graph for each vserver on the host (note after more than 4 vservers this can get noisy) munin::plugin { "vserver_cpu_": config => "user root\n", - script_path => "/usr/local/share/munin-plugins"; + script_path_in => "/usr/local/share/munin-plugins"; } } } -} define vs_create($in_domain, $context, $legacy = false, $distro = 'etch', $debootstrap_mirror = 'http://ftp.debian.org/debian', $hostname = false, $interface = false) { |