diff options
author | Micah Anderson <micah@riseup.net> | 2013-04-03 14:36:04 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-04-03 14:36:04 -0400 |
commit | 38ce9a5950f1aadfb8b844c2ba4d280b06456489 (patch) | |
tree | 134fddead133ab7442afbcc8a6cba624ddb6a488 /manifests/base.pp | |
parent | 95f55b7586e850fc9d31fc08a86a5bf25a7abb37 (diff) | |
parent | 74fe8e6a586bec3b04a7b51beb4ed2f8fbc27e03 (diff) |
Merge remote-tracking branch 'leap/master' into riseup
Conflicts:
manifests/centos.pp
manifests/init.pp
manifests/linux.pp
Diffstat (limited to 'manifests/base.pp')
-rw-r--r-- | manifests/base.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 3061902..9fed2de 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,13 +1,13 @@ class stunnel::base { - file { "/etc/stunnel": + file { '/etc/stunnel': ensure => directory; } service { 'stunnel': - name => 'stunnel', - enable => true, - ensure => running, + ensure => running, + name => 'stunnel', + enable => true, hasstatus => false; } } |