summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-03 14:16:10 -0400
committerMicah Anderson <micah@riseup.net>2013-04-03 14:16:29 -0400
commit82db11a2efdd0d543b56c99a80cad4ffd90d5ba9 (patch)
tree83978ca50674b83ce44843fd1d62c9ff7f566c21 /puppet
parentd2b525e0e471792ecc734b7b9f4f7ebcb98d868f (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
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_stunnel/manifests/init.pp3
m---------puppet/modules/stunnel0
2 files changed, 1 insertions, 2 deletions
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