X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fstunnel4%2Ftemplates%2Fstunnel.conf.erb;h=d2a3258ae89888886ec35b470f96c47fcebd6d5a;hb=7f18f21c8a9d538bac4a1ae874b492a80f432623;hp=b4d544883cc6264beb6e496574eb33671b465212;hpb=f0a682647864402c133fe0825b1438d8a1aa3cf8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/stunnel4/templates/stunnel.conf.erb b/modules/stunnel4/templates/stunnel.conf.erb
index b4d544883..d2a3258ae 100644
--- a/modules/stunnel4/templates/stunnel.conf.erb
+++ b/modules/stunnel4/templates/stunnel.conf.erb
@@ -5,7 +5,7 @@
 
 <%- if client -%>
 cert = /etc/ssl/debian/certs/thishost.crt
-key = /etc/ssl/debian/keys/thishost.key
+key = /etc/ssl/private/thishost.key
 <%- else -%>
 cert = /etc/exim4/ssl/thishost.crt
 key = /etc/exim4/ssl/thishost.key
@@ -31,6 +31,9 @@ debug = notice
 
 client = <%= client ? "yes" : "no" %>
 
+socket = a:SO_LINGER=1:60
+socket = a:SO_KEEPALIVE=1
+
 [<%= name %>-server]
 accept = <%= accept =~ /:/ ? accept : ":::#{accept}" %>
 connect = <%= connect %>