2011-08-19 17:40:54 +00:00
|
|
|
diff -urNp stunnel-4.42/tools/stunnel.conf-sample.in stunnel-4.42-cvs-patched/tools/stunnel.conf-sample.in
|
|
|
|
--- stunnel-4.42/tools/stunnel.conf-sample.in 2011-07-24 01:51:56.000000000 -0400
|
|
|
|
+++ stunnel-4.42-cvs-patched/tools/stunnel.conf-sample.in 2011-08-19 13:30:58.823586297 -0400
|
2011-08-01 22:02:19 +00:00
|
|
|
@@ -8,7 +8,7 @@
|
2010-01-26 20:15:10 +00:00
|
|
|
|
2011-08-01 22:02:19 +00:00
|
|
|
; A copy of some devices and system files is needed within the chroot jail
|
|
|
|
; Chroot conflicts with configuration file reload and many other features
|
2010-01-26 20:15:10 +00:00
|
|
|
-chroot = @prefix@/var/lib/stunnel/
|
|
|
|
+chroot = @localstatedir@/run/stunnel/
|
2011-08-01 22:02:19 +00:00
|
|
|
; Chroot jail can be escaped if setuid option is not used
|
2010-01-26 20:15:10 +00:00
|
|
|
setuid = nobody
|
|
|
|
setgid = @DEFAULT_GROUP@
|
2011-08-01 22:02:19 +00:00
|
|
|
@@ -25,8 +25,8 @@ pid = /stunnel.pid
|
|
|
|
; *****************************************************************************
|
|
|
|
|
|
|
|
; Certificate/key is needed in server mode and optional in client mode
|
|
|
|
-cert = @prefix@/etc/stunnel/mail.pem
|
|
|
|
-;key = @prefix@/etc/stunnel/mail.pem
|
|
|
|
+cert = @sysconfdir@/stunnel/mail.pem
|
|
|
|
+;key = @sysconfdir@/stunnel/mail.pem
|
|
|
|
|
|
|
|
; Authentication stuff needs to be configured to prevent MITM attacks
|
|
|
|
; It is not enabled by default!
|
|
|
|
@@ -35,12 +35,13 @@ cert = @prefix@/etc/stunnel/mail.pem
|
2010-01-26 20:15:10 +00:00
|
|
|
; CApath is located inside chroot jail
|
|
|
|
;CApath = /certs
|
2011-06-28 17:17:30 +00:00
|
|
|
; It's often easier to use CAfile
|
2010-01-26 20:15:10 +00:00
|
|
|
-;CAfile = @prefix@/etc/stunnel/certs.pem
|
|
|
|
+;CAfile = @sysconfdir@/stunnel/certs.pem
|
|
|
|
+;CAfile = @sysconfdir@/pki/tls/certs/ca-bundle.crt
|
2011-06-28 17:17:30 +00:00
|
|
|
; Don't forget to c_rehash CRLpath
|
2010-01-26 20:15:10 +00:00
|
|
|
; CRLpath is located inside chroot jail
|
|
|
|
;CRLpath = /crls
|
2011-06-28 17:17:30 +00:00
|
|
|
; Alternatively CRLfile can be used
|
2010-01-26 20:15:10 +00:00
|
|
|
-;CRLfile = @prefix@/etc/stunnel/crls.pem
|
|
|
|
+;CRLfile = @sysconfdir@/stunnel/crls.pem
|
|
|
|
|
2011-08-01 22:02:19 +00:00
|
|
|
; Disable support for insecure SSLv2 protocol
|
|
|
|
options = NO_SSLv2
|