1 |
jpp |
1.1 |
diff -Nur e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35SSL10SSLCertificateChainFile e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35SSL10SSLCertificateChainFile |
2 |
|
|
--- e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35SSL10SSLCertificateChainFile 2008-10-07 11:53:34.000000000 -0400 |
3 |
|
|
+++ e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35SSL10SSLCertificateChainFile 2020-12-10 22:23:50.840000000 -0500 |
4 |
|
|
@@ -1,6 +1,6 @@ |
5 |
|
|
{ |
6 |
|
|
my $chain_file = $modSSL{CertificateChainFile} |
7 |
|
|
or return "# modSSL{CertificateChainFile} not set"; |
8 |
|
|
- |
9 |
|
|
+ return "# modSSL{CertificateChainFile} does not exist" unless -e $chain_file; |
10 |
|
|
$OUT = "SSLCertificateChainFile $chain_file"; |
11 |
|
|
} |
12 |
|
|
diff -Nur e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35SSL10SSLCertificateFile e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35SSL10SSLCertificateFile |
13 |
|
|
--- e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35SSL10SSLCertificateFile 2003-01-24 17:51:59.000000000 -0500 |
14 |
|
|
+++ e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35SSL10SSLCertificateFile 2020-12-10 22:22:43.409000000 -0500 |
15 |
|
|
@@ -1,9 +1,10 @@ |
16 |
|
|
{ |
17 |
|
|
- my $crt = $modSSL{'crt'} || |
18 |
|
|
- "/home/e-smith/ssl.crt/${SystemName}.${DomainName}.crt"; |
19 |
|
|
- |
20 |
|
|
- my $key = $modSSL{'key'} || |
21 |
|
|
- "/home/e-smith/ssl.key/${SystemName}.${DomainName}.key"; |
22 |
|
|
+ my $defaultcrt = "/home/e-smith/ssl.crt/${SystemName}.${DomainName}.crt"; |
23 |
|
|
+ my $defaultkey = "/home/e-smith/ssl.key/${SystemName}.${DomainName}.key"; |
24 |
|
|
+ my $crt = $modSSL{'crt'} || $defaultcrt; |
25 |
|
|
+ $crt = $defaultcrt unless -e $crt; |
26 |
|
|
+ my $key = $modSSL{'key'} || $defaultkey; |
27 |
|
|
+ $key = $defaultkey unless -e $key; |
28 |
|
|
|
29 |
|
|
$OUT .= <<SSL_END; |
30 |
|
|
SSLCertificateFile $crt |