aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-02-09 09:11:01 +0000
committerMichael Scherer <misc@mageia.org>2012-02-09 09:11:01 +0000
commit7e9a6a9cfb1178207fffff0ee495440855b04a59 (patch)
treeadbb9872caeda49261863baa483536e3d78a0142
parent987778ac6d8db7e9c4a30e1ef005d7a6c2bc9f98 (diff)
downloadpuppet-7e9a6a9cfb1178207fffff0ee495440855b04a59.tar
puppet-7e9a6a9cfb1178207fffff0ee495440855b04a59.tar.gz
puppet-7e9a6a9cfb1178207fffff0ee495440855b04a59.tar.bz2
puppet-7e9a6a9cfb1178207fffff0ee495440855b04a59.tar.xz
puppet-7e9a6a9cfb1178207fffff0ee495440855b04a59.zip
make puppet-lint happier, and use short form option for puppet invocation
-rw-r--r--modules/puppet/manifests/client.pp24
1 files changed, 11 insertions, 13 deletions
diff --git a/modules/puppet/manifests/client.pp b/modules/puppet/manifests/client.pp
index 6f344165..55894d9b 100644
--- a/modules/puppet/manifests/client.pp
+++ b/modules/puppet/manifests/client.pp
@@ -1,23 +1,21 @@
class puppet::client {
- package { puppet: }
+ package { 'puppet': }
- file { "/etc/puppet/puppet.conf":
- content => template("puppet/puppet.conf"),
- require => Package[puppet]
+ file { '/etc/puppet/puppet.conf':
+ content => template('puppet/puppet.conf'),
+ require => Package[puppet],
}
- cron { "puppet":
- command => "/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog > /dev/null 2>&1",
- user => "root",
- minute => fqdn_rand( 60 ),
- ensure => present,
+ cron { 'puppet':
+ ensure => present,
+ command => '/usr/sbin/puppetd -o --no-daemonize -l syslog >/dev/null 2>&1',
+ user => 'root',
+ minute => fqdn_rand( 60 ),
}
# we are using cron, so no need for the service
- service { puppet:
- enable => false,
+ service { 'puppet':
+ enable => false,
hasstatus => true,
}
}
-
-