opt/stunnel/stunnel-config.patch

54 lines
1.9 KiB
Diff
Raw Normal View History

2010-03-25 10:41:00 +01:00
diff -Nru stunnel-4.32.orig/src/Makefile.in stunnel-4.32/src/Makefile.in
--- stunnel-4.32.orig/src/Makefile.in 2010-03-24 18:40:21.000000000 +0100
+++ stunnel-4.32/src/Makefile.in 2010-03-24 18:40:41.000000000 +0100
2009-04-17 13:25:55 +02:00
@@ -227,7 +227,7 @@
2006-03-12 13:35:51 +01:00
INCLUDES = -I/usr/kerberos/include
# Additional compiler flags
2008-04-09 09:45:31 +02:00
-AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
+AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
2006-03-12 13:35:51 +01:00
# Win32 executable
2006-09-02 10:53:15 +02:00
EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c os2.mak
2010-03-25 10:41:00 +01:00
diff -Nru stunnel-4.32.orig/tools/stunnel.conf-sample.in stunnel-4.32/tools/stunnel.conf-sample.in
--- stunnel-4.32.orig/tools/stunnel.conf-sample.in 2010-03-24 18:40:21.000000000 +0100
+++ stunnel-4.32/tools/stunnel.conf-sample.in 2010-03-24 19:09:56.000000000 +0100
@@ -4,17 +4,20 @@
; please read the manual and make sure you understand them
2006-03-12 13:35:51 +01:00
2010-03-25 10:41:00 +01:00
; certificate/key is needed in server mode and optional in client mode
2006-03-12 13:35:51 +01:00
-cert = @prefix@/etc/stunnel/mail.pem
-;key = @prefix@/etc/stunnel/mail.pem
+cert = /etc/ssl/certs/stunnel.crt
+key = /etc/ssl/keys/stunnel.key
2010-03-25 10:41:00 +01:00
; protocol version (all, SSLv2, SSLv3, TLSv1)
2006-09-02 10:53:15 +02:00
sslVersion = SSLv3
2010-03-25 10:41:00 +01:00
+; Enable or disable the use of libwrap
+libwrap = yes
+
; security enhancements for UNIX systems - comment them out on Win32
; for chroot a copy of some devices and files is needed within the jail
2006-03-12 13:35:51 +01:00
-chroot = @prefix@/var/lib/stunnel/
+chroot = /var/run/stunnel/
setuid = nobody
2006-09-02 10:53:15 +02:00
-setgid = @DEFAULT_GROUP@
2006-03-12 13:35:51 +01:00
+setgid = nobody
2009-04-17 13:25:55 +02:00
; PID is created inside the chroot jail
2006-03-12 13:35:51 +01:00
pid = /stunnel.pid
2010-03-25 10:41:00 +01:00
@@ -42,7 +45,12 @@
2006-03-12 13:35:51 +01:00
2010-03-25 10:41:00 +01:00
; debugging stuff (may useful for troubleshooting)
2006-03-12 13:35:51 +01:00
;debug = 7
2010-03-25 10:41:00 +01:00
+; logfile is created inside the chroot jail
;output = stunnel.log
+; without chroot
+;output = /var/log/stunnel.log
+; log via syslog
+syslog = yes
; SSL client mode
2006-03-12 13:35:51 +01:00
;client = yes