| 1 |
jpp |
1.2 |
diff -Nur e-smith-proftpd-2.6.0.old/root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS e-smith-proftpd-2.6.0/root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS |
| 2 |
|
|
--- e-smith-proftpd-2.6.0.old/root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS 2021-01-08 16:48:17.164000000 -0500 |
| 3 |
|
|
+++ e-smith-proftpd-2.6.0/root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS 2021-01-08 16:54:35.212000000 -0500 |
| 4 |
|
|
@@ -7,15 +7,19 @@ |
| 5 |
|
|
my $tlsrequired = $ftp{'TLSRequired'} || "on"; |
| 6 |
|
|
my $tlsclient = $ftp{'TLSVerifyClient'} || "off"; |
| 7 |
|
|
#use the same crt and key of httpd |
| 8 |
|
|
- my $crt = $modSSL{'crt'} || |
| 9 |
|
|
- "/home/e-smith/ssl.crt/${SystemName}.${DomainName}.crt"; |
| 10 |
|
|
+ my $defaultcrt = "/home/e-smith/ssl.crt/${SystemName}.${DomainName}.crt"; |
| 11 |
|
|
+ my $defaultkey = "/home/e-smith/ssl.key/${SystemName}.${DomainName}.key"; |
| 12 |
|
|
+ |
| 13 |
|
|
+ my $crt = $modSSL{'crt'} || $defaultcrt; |
| 14 |
|
|
+ $crt = $defaultcrt unless -e $crt; |
| 15 |
|
|
+ my $key = $modSSL{'key'} || $defaultkey; |
| 16 |
|
|
+ $key = $defaultkey unless -e $key; |
| 17 |
|
|
|
| 18 |
|
|
- my $key = $modSSL{'key'} || |
| 19 |
|
|
- "/home/e-smith/ssl.key/${SystemName}.${DomainName}.key"; |
| 20 |
|
|
my $chain_file = $modSSL{CertificateChainFile} || |
| 21 |
|
|
"# no chain cert"; |
| 22 |
|
|
+ $chain_file = "# no chain cert" unless -e $chain_file; |
| 23 |
|
|
|
| 24 |
|
|
- $chain_file = ( $chain_file eq "# no chain cert" )? $chain_file : "TLSCertificateChainFile $chain_file"; |
| 25 |
|
|
+ $chain_file = ( $chain_file eq "# no chain cert" )? $chain_file : "TLSCertificateChainFile $chain_file"; |
| 26 |
|
|
|
| 27 |
|
|
$OUT .= <<SSL_END; |
| 28 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
