diff options
| author | Micah Anderson <micah@riseup.net> | 2010-11-28 13:01:46 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-11-28 13:01:46 -0500 |
| commit | 735572fac73a710321b2bc469be2cbdf17c46b11 (patch) | |
| tree | 96b4c66216e132b7f1244456d074b4b69d01ba70 /manifests/base.pp | |
| parent | bec32391d6678a9f52f71658d98a2700ddd31f60 (diff) | |
Fix whitespace and coding standards to use standard formatting styles (I believe that this Closes #2353)
Diffstat (limited to 'manifests/base.pp')
| -rw-r--r-- | manifests/base.pp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 0a6e2f9..13f8c74 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,4 +1,5 @@ class puppet::base { + if !$puppet_config { $puppet_config = '/etc/puppet/puppet.conf' } $puppet_majorversion = regsubst($puppetversion,'^(\d+\.\d+).*$','\1') @@ -13,11 +14,12 @@ class puppet::base { "puppet:///modules/puppet/client/puppet.conf.$operatingsystem", "puppet:///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 + # 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': + + service { 'puppet': ensure => running, enable => true, hasstatus => true, |