Annotation of /trunk/proftpd/patches/proftpd-1.3.3-config-tls-make-cert.patch
Parent Directory | Revision Log
Revision 999 -
(hide annotations)
(download)
Thu Mar 4 13:37:20 2010 UTC (14 years, 6 months ago) by niro
File size: 3871 byte(s)
Thu Mar 4 13:37:20 2010 UTC (14 years, 6 months ago) by niro
File size: 3871 byte(s)
-more tls fixes
1 | niro | 999 | diff -Naur proftpd-1.3.3/sample-configurations/anonymous.conf proftpd-1.3.3-magellan/sample-configurations/anonymous.conf |
2 | --- proftpd-1.3.3/sample-configurations/anonymous.conf 2010-03-04 14:21:43.000000000 +0100 | ||
3 | +++ proftpd-1.3.3-magellan/sample-configurations/anonymous.conf 2010-03-04 14:24:11.000000000 +0100 | ||
4 | @@ -56,15 +56,13 @@ | ||
5 | # Enable this with PROFTPD_OPTIONS=-DTLS in /etc/conf.d/proftpd | ||
6 | # | ||
7 | # Generate the certificate as follows: | ||
8 | -# openssl req -new -x509 -days 365 -nodes \ | ||
9 | -# -out /etc/ssl/certs/proftpd.cert.pem \ | ||
10 | -# -keyout /etc/ssl/certs/proftpd.key.pem | ||
11 | +# openssl-make-cert proftpd | ||
12 | # | ||
13 | <IfDefine TLS> | ||
14 | TLSEngine on | ||
15 | TLSRequired on | ||
16 | - TLSRSACertificateFile /etc/ssl/certs/proftpd.cert.pem | ||
17 | - TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.key.pem | ||
18 | + TLSRSACertificateFile /etc/ssl/certs/proftpd.pem | ||
19 | + TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.pem | ||
20 | TLSCipherSuite ALL:!ADH:!DES | ||
21 | TLSOptions NoCertRequest | ||
22 | TLSVerifyClient off | ||
23 | diff -Naur proftpd-1.3.3/sample-configurations/basic.conf proftpd-1.3.3-magellan/sample-configurations/basic.conf | ||
24 | --- proftpd-1.3.3/sample-configurations/basic.conf 2010-03-04 14:21:43.000000000 +0100 | ||
25 | +++ proftpd-1.3.3-magellan/sample-configurations/basic.conf 2010-03-04 14:24:52.000000000 +0100 | ||
26 | @@ -57,15 +57,13 @@ | ||
27 | # Enable this with PROFTPD_OPTIONS=-DTLS in /etc/conf.d/proftpd | ||
28 | # | ||
29 | # Generate the certificate as follows: | ||
30 | -# openssl req -new -x509 -days 365 -nodes \ | ||
31 | -# -out /etc/ssl/certs/proftpd.cert.pem \ | ||
32 | -# -keyout /etc/ssl/certs/proftpd.key.pem | ||
33 | +# openssl-make-cert proftpd | ||
34 | # | ||
35 | <IfDefine TLS> | ||
36 | TLSEngine on | ||
37 | TLSRequired on | ||
38 | - TLSRSACertificateFile /etc/ssl/certs/proftpd.cert.pem | ||
39 | - TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.key.pem | ||
40 | + TLSRSACertificateFile /etc/ssl/certs/proftpd.pem | ||
41 | + TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.pem | ||
42 | TLSCipherSuite ALL:!ADH:!DES | ||
43 | TLSOptions NoCertRequest | ||
44 | TLSVerifyClient off | ||
45 | diff -Naur proftpd-1.3.3/sample-configurations/mod_sql.conf proftpd-1.3.3-magellan/sample-configurations/mod_sql.conf | ||
46 | --- proftpd-1.3.3/sample-configurations/mod_sql.conf 2010-03-04 14:21:43.000000000 +0100 | ||
47 | +++ proftpd-1.3.3-magellan/sample-configurations/mod_sql.conf 2010-03-04 14:25:13.000000000 +0100 | ||
48 | @@ -87,15 +87,13 @@ | ||
49 | # Enable this with PROFTPD_OPTIONS=-DTLS in /etc/conf.d/proftpd | ||
50 | # | ||
51 | # Generate the certificate as follows: | ||
52 | -# openssl req -new -x509 -days 365 -nodes \ | ||
53 | -# -out /etc/ssl/certs/proftpd.cert.pem \ | ||
54 | -# -keyout /etc/ssl/certs/proftpd.key.pem | ||
55 | +# openssl-make-cert proftpd | ||
56 | # | ||
57 | <IfDefine TLS> | ||
58 | TLSEngine on | ||
59 | TLSRequired on | ||
60 | - TLSRSACertificateFile /etc/ssl/certs/proftpd.cert.pem | ||
61 | - TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.key.pem | ||
62 | + TLSRSACertificateFile /etc/ssl/certs/proftpd.pem | ||
63 | + TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.pem | ||
64 | TLSCipherSuite ALL:!ADH:!DES | ||
65 | TLSOptions NoCertRequest | ||
66 | TLSVerifyClient off | ||
67 | diff -Naur proftpd-1.3.3/sample-configurations/virtual.conf proftpd-1.3.3-magellan/sample-configurations/virtual.conf | ||
68 | --- proftpd-1.3.3/sample-configurations/virtual.conf 2010-03-04 14:21:43.000000000 +0100 | ||
69 | +++ proftpd-1.3.3-magellan/sample-configurations/virtual.conf 2010-03-04 14:25:54.000000000 +0100 | ||
70 | @@ -52,15 +52,13 @@ | ||
71 | # Enable this with PROFTPD_OPTIONS=-DTLS in /etc/conf.d/proftpd | ||
72 | # | ||
73 | # Generate the certificate as follows: | ||
74 | -# openssl req -new -x509 -days 365 -nodes \ | ||
75 | -# -out /etc/ssl/certs/proftpd.cert.pem \ | ||
76 | -# -keyout /etc/ssl/certs/proftpd.key.pem | ||
77 | +# openssl-make-cert proftpd | ||
78 | # | ||
79 | <IfDefine TLS> | ||
80 | TLSEngine on | ||
81 | TLSRequired on | ||
82 | - TLSRSACertificateFile /etc/ssl/certs/proftpd.cert.pem | ||
83 | - TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.key.pem | ||
84 | + TLSRSACertificateFile /etc/ssl/certs/proftpd.pem | ||
85 | + TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.pem | ||
86 | TLSCipherSuite ALL:!ADH:!DES | ||
87 | TLSOptions NoCertRequest | ||
88 | TLSVerifyClient off |