aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-02-09 09:11:02 +0000
committerMichael Scherer <misc@mageia.org>2012-02-09 09:11:02 +0000
commit41e2dcc7e97d1a4f658053faf2f64551780cd2bf (patch)
tree375781dc04e9d480b87065068fe01022fe0df06d /modules
parent7e9a6a9cfb1178207fffff0ee495440855b04a59 (diff)
downloadpuppet-41e2dcc7e97d1a4f658053faf2f64551780cd2bf.tar
puppet-41e2dcc7e97d1a4f658053faf2f64551780cd2bf.tar.gz
puppet-41e2dcc7e97d1a4f658053faf2f64551780cd2bf.tar.bz2
puppet-41e2dcc7e97d1a4f658053faf2f64551780cd2bf.tar.xz
puppet-41e2dcc7e97d1a4f658053faf2f64551780cd2bf.zip
make it puppet-lint compliant, and use proper scoping for puppet 2.8
migration ( ie, use $::foo instead of $foo for facts )
Diffstat (limited to 'modules')
-rw-r--r--modules/puppet/manifests/master.pp23
1 files changed, 12 insertions, 11 deletions
diff --git a/modules/puppet/manifests/master.pp b/modules/puppet/manifests/master.pp
index 243e8137..5975b700 100644
--- a/modules/puppet/manifests/master.pp
+++ b/modules/puppet/manifests/master.pp
@@ -5,31 +5,32 @@ class puppet::master {
# rails and sqlite3 are used for stored config
package { ['ruby-sqlite3', 'puppet-server', 'ruby-rails']: }
- service { puppetmaster:
- subscribe => [ Package['puppet-server'], File['/etc/puppet/puppet.conf']]
+ service { 'puppetmaster':
+ subscribe => [Package['puppet-server'],
+ File['/etc/puppet/puppet.conf']],
}
file { '/etc/puppet/extdata':
- ensure => directory,
- owner => puppet,
- group => puppet,
- mode => '0700',
+ ensure => directory,
+ owner => puppet,
+ group => puppet,
+ mode => '0700',
recurse => true,
}
file { '/etc/puppet/tagmail.conf':
- content => template("puppet/tagmail.conf"),
+ content => template('puppet/tagmail.conf'),
}
tidy { '/var/lib/puppet/reports':
- age => "4w",
- matches => "*.yaml",
+ age => '4w',
+ matches => '*.yaml',
recurse => true,
- type => "mtime",
+ type => 'mtime',
}
file { '/etc/puppet/autosign.conf':
- ensure => $environment ? {
+ ensure => $::environment ? {
'test' => 'present',
default => 'absent',
},