/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11252-validate-certfiles-exists.patch
ViewVC logotype

Diff of /rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11252-validate-certfiles-exists.patch

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

Revision 1.1 by jpp, Fri Dec 11 18:50:02 2020 UTC Revision 1.2 by jpp, Sat Dec 12 04:10:44 2020 UTC
# Line 6  diff -Nur e-smith-base-5.8.0.old/root/et Line 6  diff -Nur e-smith-base-5.8.0.old/root/et
6       # so we do not need to expand openssl.conf       # so we do not need to expand openssl.conf
7       my $key = $modSSL{'key'};       my $key = $modSSL{'key'};
8  -    unless ($key)  -    unless ($key)
9  +    unless (-e $key)  +    unless ($key and -e $key)
10       {       {
11           use esmith::templates;           use esmith::templates;
12           esmith::templates::processTemplate({           esmith::templates::processTemplate({
# Line 18  diff -Nur e-smith-base-5.8.0.old/root/et Line 18  diff -Nur e-smith-base-5.8.0.old/root/et
18    
19       my $key = $modSSL{'key'};       my $key = $modSSL{'key'};
20  -    unless ($key)  -    unless ($key)
21  +    unless (-e $key)  +    unless ($key and -e $key)
22       {       {
23          $key = "/home/e-smith/ssl.key/$hostname.$domain.key";          $key = "/home/e-smith/ssl.key/$hostname.$domain.key";
24          use esmith::templates;          use esmith::templates;
# Line 30  diff -Nur e-smith-base-5.8.0.old/root/et Line 30  diff -Nur e-smith-base-5.8.0.old/root/et
30    
31       my $crt = $modSSL{'crt'};       my $crt = $modSSL{'crt'};
32  -    unless ($crt)  -    unless ($crt)
33  +    unless (-e $crt)  +    unless ($crt and -e $crt)
34       {       {
35          $crt = "/home/e-smith/ssl.crt/$hostname.$domain.crt";          $crt = "/home/e-smith/ssl.crt/$hostname.$domain.crt";
36          use esmith::templates;          use esmith::templates;
# Line 41  diff -Nur e-smith-base-5.8.0.old/root/et Line 41  diff -Nur e-smith-base-5.8.0.old/root/et
41   {   {
42       my $pem = $modSSL{'CertificateChainFile'};       my $pem = $modSSL{'CertificateChainFile'};
43  -    if ($pem)  -    if ($pem)
44  +    if (-e $pem)  +    if ($pem and -e $pem)
45       {       {
46           open(PEM, $pem) or warn "Intermediate Certificate File defined, but cannot open $pem : $!";           open(PEM, $pem) or warn "Intermediate Certificate File defined, but cannot open $pem : $!";
47           my @pem = <PEM>;           my @pem = <PEM>;

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