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/centos.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/centos.pp')
| -rw-r--r-- | manifests/centos.pp | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/manifests/centos.pp b/manifests/centos.pp index 14aac8f..19a4684 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -1,16 +1,19 @@ class stunnel::centos inherits stunnel::linux { - file{'/etc/init.d/stunnel': - source => "puppet:///modules/stunnel/${::operatingsystem}/stunnel.init", + file { '/etc/init.d/stunnel': + source => "puppet:///modules/stunnel/${::operatingsystem}/stunnel.init", require => Package['stunnel'], - before => Service['stunnel'], - owner => root, group => 0, mode => 0755; + before => Service['stunnel'], + owner => root, + group => 0, + mode => '0755'; } - user::managed{ "stunnel": - homedir => "/var/run/stunnel", - shell => "/sbin/nologin", - uid => 105, gid => 105; + user::managed { 'stunnel': + homedir => '/var/run/stunnel', + shell => '/sbin/nologin', + uid => 105, + gid => 105; } Service['stunnel']{ @@ -18,13 +21,15 @@ class stunnel::centos inherits stunnel::linux { require => [ User['stunnel'], File['/etc/init.d/stunnel'] ] } - file{'/etc/stunnel/stunnel.conf': - source => [ "puppet:///modules/site_stunnel/${::fqdn}/stunnel.conf", - "puppet:///modules/site_stunnel/${stunnel::cluster}/stunnel.conf", - "puppet:///modules/site_stunnel/stunnel.conf", - "puppet:///modules/stunnel/${::operatingsystem}/stunnel.conf" ], + file { '/etc/stunnel/stunnel.conf': + source => [ "puppet:///modules/site-stunnel/${::fqdn}/stunnel.conf", + "puppet:///modules/site-stunnel/${stunnel::cluster}/stunnel.conf", + 'puppet:///modules/site-stunnel/stunnel.conf', + 'puppet:///modules/stunnel/${::operatingsystem}/stunnel.conf' ], require => Package['stunnel'], - notify => Service['stunnel'], - owner => root, group => 0, mode => 0600; + notify => Service['stunnel'], + owner => root, + group => 0, + mode => '0600'; } } |