diff options
| author | varac <varacanero@zeromail.org> | 2016-04-25 16:41:34 -0300 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-04-25 16:41:34 -0300 |
| commit | 07f8cf9c307471128eef1ded3a77633869c89bcd (patch) | |
| tree | 22705e582bb300936db0fb343402011b704f9596 /puppet/modules/site_stunnel | |
| parent | 2c5d27327bc1a90f5813e55a40d0acac644a13eb (diff) | |
| parent | f2f2c7391056c252523730cd76ab759db9117c9c (diff) | |
Merge branch 'linting' into develop
Diffstat (limited to 'puppet/modules/site_stunnel')
| -rw-r--r-- | puppet/modules/site_stunnel/manifests/init.pp | 4 | ||||
| -rw-r--r-- | puppet/modules/site_stunnel/manifests/override_service.pp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/puppet/modules/site_stunnel/manifests/init.pp b/puppet/modules/site_stunnel/manifests/init.pp index d919a072..a874721f 100644 --- a/puppet/modules/site_stunnel/manifests/init.pp +++ b/puppet/modules/site_stunnel/manifests/init.pp @@ -36,8 +36,8 @@ class site_stunnel { # the default is to keep 356 log files for each stunnel. # here we set a more reasonable number. augeas { - "logrotate_stunnel": - context => "/files/etc/logrotate.d/stunnel4/rule", + 'logrotate_stunnel': + context => '/files/etc/logrotate.d/stunnel4/rule', changes => [ 'set rotate 5', ] diff --git a/puppet/modules/site_stunnel/manifests/override_service.pp b/puppet/modules/site_stunnel/manifests/override_service.pp index 96187048..435b9aa0 100644 --- a/puppet/modules/site_stunnel/manifests/override_service.pp +++ b/puppet/modules/site_stunnel/manifests/override_service.pp @@ -1,4 +1,9 @@ +# override stunnel::debian defaults +# +# ignore puppet lint error about inheriting from different namespace +# lint:ignore:inherits_across_namespaces class site_stunnel::override_service inherits stunnel::debian { +# lint:endignore include site_config::x509::cert include site_config::x509::key |