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

Annotation 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


Revision 1.2 - (hide annotations) (download)
Sat Dec 12 04:10:44 2020 UTC (3 years, 10 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-base-5_8_0-71_el7_sme, e-smith-base-5_8_0-69_el7_sme, e-smith-base-5_8_0-70_el7_sme, e-smith-base-5_8_0-83_el7_sme, e-smith-base-5_8_0-96_el7_sme, e-smith-base-5_8_0-95_el7_sme, e-smith-base-5_8_0-80_el7_sme, e-smith-base-5_8_0-85_el7_sme, e-smith-base-5_8_0-81_el7_sme, e-smith-base-5_8_0-82_el7_sme, e-smith-base-5_8_0-88_el7_sme, e-smith-base-5_8_0-99_el7_sme, e-smith-base-5_8_0-94_el7_sme, e-smith-base-5_8_0-98_el7_sme, e-smith-base-5_8_0-97_el7_sme, e-smith-base-5_8_0-92_el7_sme, e-smith-base-5_8_0-75_el7_sme, e-smith-base-5_8_0-78_el7_sme, e-smith-base-5_8_0-90_el7_sme, e-smith-base-5_8_0-93_el7_sme, e-smith-base-5_8_0-74_el7_sme, e-smith-base-5_8_0-77_el7_sme, e-smith-base-5_8_0-73_el7_sme, e-smith-base-5_8_0-76_el7_sme, e-smith-base-5_8_0-79_el7_sme, e-smith-base-5_8_0-91_el7_sme, e-smith-base-5_8_0-86_el7_sme, e-smith-base-5_8_0-87_el7_sme, e-smith-base-5_8_0-72_el7_sme, e-smith-base-5_8_0-84_el7_sme, e-smith-base-5_8_0-89_el7_sme
Changes since 1.1: +4 -4 lines
* Fri Dec 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-68.sme
- fix init-accounts [SME: 9642]

1 jpp 1.1 diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/templates/home/e-smith/ssl.pem/10openssl e-smith-base-5.8.0/root/etc/e-smith/templates/home/e-smith/ssl.pem/10openssl
2     --- e-smith-base-5.8.0.old/root/etc/e-smith/templates/home/e-smith/ssl.pem/10openssl 2020-12-11 13:01:18.492000000 -0500
3     +++ e-smith-base-5.8.0/root/etc/e-smith/templates/home/e-smith/ssl.pem/10openssl 2020-12-11 13:44:42.845000000 -0500
4     @@ -3,7 +3,7 @@
5     # if key is defined, we do not need to geenrate a self signed certificate
6     # so we do not need to expand openssl.conf
7     my $key = $modSSL{'key'};
8     - unless ($key)
9 jpp 1.2 + unless ($key and -e $key)
10 jpp 1.1 {
11     use esmith::templates;
12     esmith::templates::processTemplate({
13     diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/templates/home/e-smith/ssl.pem/20key e-smith-base-5.8.0/root/etc/e-smith/templates/home/e-smith/ssl.pem/20key
14     --- e-smith-base-5.8.0.old/root/etc/e-smith/templates/home/e-smith/ssl.pem/20key 2005-11-20 23:28:09.000000000 -0500
15     +++ e-smith-base-5.8.0/root/etc/e-smith/templates/home/e-smith/ssl.pem/20key 2020-12-11 13:44:56.268000000 -0500
16     @@ -4,7 +4,7 @@
17     $OUT = '';
18    
19     my $key = $modSSL{'key'};
20     - unless ($key)
21 jpp 1.2 + unless ($key and -e $key)
22 jpp 1.1 {
23     $key = "/home/e-smith/ssl.key/$hostname.$domain.key";
24     use esmith::templates;
25     diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/templates/home/e-smith/ssl.pem/40crt e-smith-base-5.8.0/root/etc/e-smith/templates/home/e-smith/ssl.pem/40crt
26     --- e-smith-base-5.8.0.old/root/etc/e-smith/templates/home/e-smith/ssl.pem/40crt 2005-11-20 23:28:09.000000000 -0500
27     +++ e-smith-base-5.8.0/root/etc/e-smith/templates/home/e-smith/ssl.pem/40crt 2020-12-11 13:45:10.138000000 -0500
28     @@ -3,7 +3,7 @@
29     my $hostname = $SystemName || "localhost";
30    
31     my $crt = $modSSL{'crt'};
32     - unless ($crt)
33 jpp 1.2 + unless ($crt and -e $crt)
34 jpp 1.1 {
35     $crt = "/home/e-smith/ssl.crt/$hostname.$domain.crt";
36     use esmith::templates;
37     diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/templates/home/e-smith/ssl.pem/60pem e-smith-base-5.8.0/root/etc/e-smith/templates/home/e-smith/ssl.pem/60pem
38     --- e-smith-base-5.8.0.old/root/etc/e-smith/templates/home/e-smith/ssl.pem/60pem 2014-03-23 22:47:24.000000000 -0400
39     +++ e-smith-base-5.8.0/root/etc/e-smith/templates/home/e-smith/ssl.pem/60pem 2020-12-11 13:45:20.521000000 -0500
40     @@ -1,6 +1,6 @@
41     {
42     my $pem = $modSSL{'CertificateChainFile'};
43     - if ($pem)
44 jpp 1.2 + if ($pem and -e $pem)
45 jpp 1.1 {
46     open(PEM, $pem) or warn "Intermediate Certificate File defined, but cannot open $pem : $!";
47     my @pem = <PEM>;

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed