diff options
| author | mh <mh@immerda.ch> | 2010-08-06 19:36:40 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-08-06 19:36:40 +0200 |
| commit | 7d904841c15873db9ac1745f659d8464fd45f41a (patch) | |
| tree | 991567a2557fa59b6502d2c0bcf87f6c786c5c34 /manifests/base.pp | |
| parent | 6bd681ab05072964efc95ecfe2816e371e45a862 (diff) | |
codestyle - whitespace
Only code style and whitespace formatting issues. Everything should
no be in ligne.
Diffstat (limited to 'manifests/base.pp')
| -rw-r--r-- | manifests/base.pp | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index ebf4d7a..598fb9e 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,25 +1,23 @@ class puppet::base { - case $puppet_config { - '': { $puppet_config = '/etc/puppet/puppet.conf' } - } + if !$puppet_config { $puppet_config = '/etc/puppet/puppet.conf' } - file { 'puppet_config': - path => "$puppet_config", - source => [ "puppet://$server/modules/site-puppet/client/${fqdn}/puppet.conf", + file { 'puppet_config': + path => "$puppet_config", + source => [ "puppet://$server/modules/site-puppet/client/${fqdn}/puppet.conf", "puppet://$server/modules/site-puppet/client/puppet.conf.$operatingsystem", "puppet://$server/modules/site-puppet/client/puppet.conf", "puppet://$server/modules/puppet/client/puppet.conf.$operatingsystem", "puppet://$server/modules/puppet/client/puppet.conf" ], - notify => Service[puppet], - # if puppetmasterd is deployed by apache2/passenger it needs to read puppet.conf - # therefore it must be readable by puppet - owner => puppet, group => 0, mode => 600; - } - service{'puppet': - ensure => running, - enable => true, - hasstatus => true, - hasrestart => true, - pattern => puppetd, - } + notify => Service[puppet], + # if puppetmasterd is deployed by apache2/passenger it needs to read puppet.conf + # therefore it must be readable by puppet + owner => puppet, group => 0, mode => 600; + } + service{'puppet': + ensure => running, + enable => true, + hasstatus => true, + hasrestart => true, + pattern => puppetd, + } } |