summaryrefslogtreecommitdiff
path: root/manifests/client
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2010-05-13 14:12:07 -0400
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2010-05-13 14:12:07 -0400
commit4591a91f7a8b169d0aa3ccb46357c60f8dcb7079 (patch)
treec5d1fbf3efcab6d8ab0f01543a0957868b3ff65b /manifests/client
parent1ffcd45c7a264864a578bd6a6866458d3756d20d (diff)
remove tabs and trailing whitespaces in manifests
Diffstat (limited to 'manifests/client')
-rw-r--r--manifests/client/base.pp12
-rw-r--r--manifests/client/centos.pp2
-rw-r--r--manifests/client/darwin.pp38
-rw-r--r--manifests/client/debian.pp18
-rw-r--r--manifests/client/gentoo.pp4
-rw-r--r--manifests/client/openbsd.pp2
-rw-r--r--manifests/client/package.pp8
7 files changed, 42 insertions, 42 deletions
diff --git a/manifests/client/base.pp b/manifests/client/base.pp
index b3fcc4a..afa12a0 100644
--- a/manifests/client/base.pp
+++ b/manifests/client/base.pp
@@ -1,6 +1,6 @@
class munin::client::base {
service { 'munin-node':
- ensure => running,
+ ensure => running,
enable => true,
hasstatus => true,
hasrestart => true,
@@ -14,10 +14,10 @@ class munin::client::base {
default => $munin_allow
}
file {'/etc/munin/munin-node.conf':
- content => template("munin/munin-node.conf.$operatingsystem"),
+ content => template("munin/munin-node.conf.$operatingsystem"),
notify => Service['munin-node'],
- mode => 0644, owner => root, group => 0,
- }
- munin::register { $fqdn: }
- include munin::plugins::base
+ mode => 0644, owner => root, group => 0,
+ }
+ munin::register { $fqdn: }
+ include munin::plugins::base
}
diff --git a/manifests/client/centos.pp b/manifests/client/centos.pp
index 46a7e3f..42e8c59 100644
--- a/manifests/client/centos.pp
+++ b/manifests/client/centos.pp
@@ -1,3 +1,3 @@
class munin::client::centos inherits munin::client::package {
- include munin::plugins::centos
+ include munin::plugins::centos
}
diff --git a/manifests/client/darwin.pp b/manifests/client/darwin.pp
index f6fc95f..369a605 100644
--- a/manifests/client/darwin.pp
+++ b/manifests/client/darwin.pp
@@ -1,21 +1,21 @@
class munin::client::darwin {
- file { "/usr/share/snmp/snmpd.conf":
- mode => 744,
- content => template("munin/darwin_snmpd.conf.erb"),
- group => 0,
- owner => root,
- }
- delete_matching_line{"startsnmpdno":
- file => "/etc/hostconfig",
- pattern => "SNMPSERVER=-NO-",
- }
- line { "startsnmpdyes":
- file => "/etc/hostconfig",
- line => "SNMPSERVER=-YES-",
- notify => Exec["/sbin/SystemStarter start SNMP"],
- }
- exec{"/sbin/SystemStarter start SNMP":
- noop => false,
- }
- munin::register_snmp { $fqdn: }
+ file { "/usr/share/snmp/snmpd.conf":
+ mode => 744,
+ content => template("munin/darwin_snmpd.conf.erb"),
+ group => 0,
+ owner => root,
+ }
+ delete_matching_line{"startsnmpdno":
+ file => "/etc/hostconfig",
+ pattern => "SNMPSERVER=-NO-",
+ }
+ line { "startsnmpdyes":
+ file => "/etc/hostconfig",
+ line => "SNMPSERVER=-YES-",
+ notify => Exec["/sbin/SystemStarter start SNMP"],
+ }
+ exec{"/sbin/SystemStarter start SNMP":
+ noop => false,
+ }
+ munin::register_snmp { $fqdn: }
}
diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp
index a6d677e..97f5fbf 100644
--- a/manifests/client/debian.pp
+++ b/manifests/client/debian.pp
@@ -1,15 +1,15 @@
class munin::client::debian inherits munin::client::package {
# the plugin will need that
- package { "iproute": ensure => installed }
+ package { "iproute": ensure => installed }
- Service["munin-node"]{
- # sarge's munin-node init script has no status
- hasstatus => $lsbdistcodename ? { sarge => false, default => true }
- }
+ Service["munin-node"]{
+ # sarge's munin-node init script has no status
+ hasstatus => $lsbdistcodename ? { sarge => false, default => true }
+ }
File["/etc/munin/munin-node.conf"]{
- content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"),
+ content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"),
}
- # workaround bug in munin_node_configure
- plugin { "postfix_mailvolume": ensure => absent }
- include munin::plugins::debian
+ # workaround bug in munin_node_configure
+ plugin { "postfix_mailvolume": ensure => absent }
+ include munin::plugins::debian
}
diff --git a/manifests/client/gentoo.pp b/manifests/client/gentoo.pp
index 53d472b..c24d317 100644
--- a/manifests/client/gentoo.pp
+++ b/manifests/client/gentoo.pp
@@ -3,6 +3,6 @@ class munin::client::gentoo inherits munin::client::package {
name => 'munin',
category => 'net-analyzer',
}
-
- include munin::plugins::gentoo
+
+ include munin::plugins::gentoo
}
diff --git a/manifests/client/openbsd.pp b/manifests/client/openbsd.pp
index 90bf7df..c10a474 100644
--- a/manifests/client/openbsd.pp
+++ b/manifests/client/openbsd.pp
@@ -5,7 +5,7 @@ class munin::client::openbsd inherits munin::client::base {
source => "puppet://$server/modules/munin/openbsd/package/munin_openbsd.tar.gz",
owner => root, group => 0, mode => 0600;
}
- package{ [ 'p5-Compress-Zlib', 'p5-Crypt-SSLeay', 'p5-HTML-Parser',
+ package{ [ 'p5-Compress-Zlib', 'p5-Crypt-SSLeay', 'p5-HTML-Parser',
'p5-HTML-Tagset', 'p5-HTTP-GHTTP', 'p5-LWP-UserAgent-Determined',
'p5-Net-SSLeay', 'p5-Net-Server', 'p5-URI', 'p5-libwww', 'pcre', 'curl' ]:
ensure => installed,
diff --git a/manifests/client/package.pp b/manifests/client/package.pp
index 84fcf5c..18566b8 100644
--- a/manifests/client/package.pp
+++ b/manifests/client/package.pp
@@ -1,11 +1,11 @@
class munin::client::package inherits munin::client::base {
- package { 'munin-node': ensure => installed }
+ package { 'munin-node': ensure => installed }
Service['munin-node']{
require => Package[munin-node],
}
File['/etc/munin/munin-node.conf']{
- # this has to be installed before the package, so the postinst can
- # boot the munin-node without failure!
- before => Package['munin-node'],
+ # this has to be installed before the package, so the postinst can
+ # boot the munin-node without failure!
+ before => Package['munin-node'],
}
}