diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-03 14:16:10 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-03 14:16:29 -0400 |
| commit | 82db11a2efdd0d543b56c99a80cad4ffd90d5ba9 (patch) | |
| tree | 83978ca50674b83ce44843fd1d62c9ff7f566c21 | |
| parent | d2b525e0e471792ecc734b7b9f4f7ebcb98d868f (diff) | |
switch stunnel module to our version which has been modified for 2.7 parameterized classes and qualified variables
update our stunnel class instantiation to be parameterized
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | puppet/modules/site_stunnel/manifests/init.pp | 3 | ||||
| m--------- | puppet/modules/stunnel | 0 |
3 files changed, 2 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 88858054..717ae5ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -69,7 +69,7 @@ url = git://labs.riseup.net/shared-tor [submodule "puppet/modules/stunnel"] path = puppet/modules/stunnel - url = git://labs.riseup.net/shared-stunnel + url = git://code.leap.se/puppet_stunnel [submodule "puppet/modules/haproxy"] path = puppet/modules/haproxy url = git://code.leap.se/puppet_haproxy diff --git a/puppet/modules/site_stunnel/manifests/init.pp b/puppet/modules/site_stunnel/manifests/init.pp index 6ba2c4b8..c7d6acc6 100644 --- a/puppet/modules/site_stunnel/manifests/init.pp +++ b/puppet/modules/site_stunnel/manifests/init.pp @@ -2,8 +2,7 @@ class site_stunnel { # include the generic stunnel module # increase the number of open files to allow for 800 connections - $stunnel_default_extra = 'ulimit -n 4096' - include stunnel + class { 'stunnel': default_extra => 'ulimit -n 4096' } # The stunnel.conf provided by the Debian package is broken by default # so we get rid of it and just define our own. See #549384 diff --git a/puppet/modules/stunnel b/puppet/modules/stunnel -Subproject 03b51fcb718734f4b2ea76c038ffbe9b2b348b1 +Subproject b53d574250598178af298c59be957693eaaddb2 |