summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2017-02-28 17:28:27 +0000
committerVarac <varac@leap.se>2017-02-28 17:28:27 +0000
commite4a2d54b3571a8f4ce46485db762acbc4b919d84 (patch)
tree3d81655c343f2ad7ed46d7d5bed5aa2bca2724e8 /puppet/modules
parentec0aca98c1ce2af5d85432dc041e6a092b77b458 (diff)
parentdea0638d978b4fab1f6ebe9f20ba51a3cb0effdd (diff)
Merge branch 'stunnel_from_backports' into 'master'
Install stunnel4 from jessie-backports Closes #8746 See merge request !72
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_stunnel/manifests/init.pp10
1 files changed, 9 insertions, 1 deletions
diff --git a/puppet/modules/site_stunnel/manifests/init.pp b/puppet/modules/site_stunnel/manifests/init.pp
index a874721f..5f53d576 100644
--- a/puppet/modules/site_stunnel/manifests/init.pp
+++ b/puppet/modules/site_stunnel/manifests/init.pp
@@ -5,6 +5,15 @@
class site_stunnel {
+ # Install stunnel4 from jessie-backports because the
+ # jessie version randonly closes the connection prematurely
+ # see https://0xacab.org/leap/platform/issues/8746
+ apt::preferences_snippet { 'stunnel4':
+ package => 'stunnel4',
+ release => "${::lsbdistcodename}-backports",
+ priority => 999;
+ }
+
# include the generic stunnel module
# increase the number of open files to allow for 800 connections
class { 'stunnel': default_extra => 'ulimit -n 4096' }
@@ -45,4 +54,3 @@ class site_stunnel {
include site_stunnel::override_service
}
-