/[smeserver]/rpms/e-smith-proftpd/sme10/e-smith-proftpd-2.6.0-bz11316-testSSLfiles.patch
ViewVC logotype

Diff of /rpms/e-smith-proftpd/sme10/e-smith-proftpd-2.6.0-bz11316-testSSLfiles.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by jpp, Fri Jan 8 21:57:11 2021 UTC Revision 1.2 by jpp, Sat Jan 9 02:44:34 2021 UTC
# Line 1  Line 1 
1  Les sous-répertoires e-smith-proftpd-2.6.0.old/root et e-smith-proftpd-2.6.0/root sont identiques  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    

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed