From 735572fac73a710321b2bc469be2cbdf17c46b11 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sun, 28 Nov 2010 13:01:46 -0500 Subject: Fix whitespace and coding standards to use standard formatting styles (I believe that this Closes #2353) --- manifests/base.pp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'manifests/base.pp') 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, -- cgit v1.2.3