1 |
terryfage |
1.1 |
diff -urN smeserver-certificate-0.0.4.old/createlinks smeserver-certificate-0.0.4/createlinks |
2 |
|
|
--- smeserver-certificate-0.0.4.old/createlinks 2022-02-28 22:09:02.026823084 -0500 |
3 |
|
|
+++ smeserver-certificate-0.0.4/createlinks 2022-03-02 17:22:56.000000000 -0500 |
4 |
|
|
@@ -11,3 +11,13 @@ |
5 |
|
|
event_link("revert_ssl_certificate",$event,"10") |
6 |
|
|
} |
7 |
|
|
|
8 |
|
|
+$event = "smeserver-certificate-update"; |
9 |
|
|
+ |
10 |
|
|
+ |
11 |
|
|
+foreach my $file (qw( |
12 |
|
|
+ /etc/systemd/system-preset/49-koozali.preset |
13 |
|
|
+ /etc/httpd/conf/httpd.conf |
14 |
|
|
+ )) |
15 |
|
|
+{ |
16 |
|
|
+ templates2events( $file, $event ); |
17 |
|
|
+} |
18 |
|
|
diff -urN smeserver-certificate-0.0.4.old/root/etc/e-smith/events/actions/revert_ssl_certificate smeserver-certificate-0.0.4/root/etc/e-smith/events/actions/revert_ssl_certificate |
19 |
|
|
--- smeserver-certificate-0.0.4.old/root/etc/e-smith/events/actions/revert_ssl_certificate 2022-02-28 22:09:02.025823124 -0500 |
20 |
|
|
+++ smeserver-certificate-0.0.4/root/etc/e-smith/events/actions/revert_ssl_certificate 2022-03-02 17:50:49.000000000 -0500 |
21 |
|
|
@@ -5,9 +5,12 @@ |
22 |
|
|
system("/sbin/e-smith/db configuration delprop modSSL crt"); |
23 |
|
|
system("/sbin/e-smith/db configuration delprop modSSL key"); |
24 |
|
|
system("/sbin/e-smith/db configuration delprop modSSL CertificateChainFile"); |
25 |
|
|
+ |
26 |
|
|
system("/sbin/e-smith/expand-template /home/e-smith/ssl.pem/pem"); |
27 |
|
|
- system("/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf"); |
28 |
|
|
- system("/sbin/service httpd-e-smith restart"); |
29 |
|
|
- system("/sbin/e-smith/signal-event ldap-update"); |
30 |
|
|
- system("/sbin/e-smith/signal-event email-update"); |
31 |
|
|
+ # system("/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf"); |
32 |
|
|
+ # system("/sbin/service httpd-e-smith restart"); |
33 |
|
|
+ # system("/sbin/e-smith/signal-event ldap-update"); |
34 |
|
|
+ # system("/sbin/e-smith/signal-event email-update"); |
35 |
|
|
+ |
36 |
|
|
+ system("/sbin/e-smith/signal-event ssl-update"); |
37 |
|
|
exit |
38 |
|
|
diff -urN smeserver-certificate-0.0.4.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm smeserver-certificate-0.0.4/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm |
39 |
|
|
--- smeserver-certificate-0.0.4.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm 2022-02-28 22:09:02.026823084 -0500 |
40 |
|
|
+++ smeserver-certificate-0.0.4/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm 2022-03-02 17:50:14.000000000 -0500 |
41 |
|
|
@@ -92,10 +92,12 @@ |
42 |
|
|
system("/sbin/e-smith/db configuration delprop modSSL CertificateChainFile"); |
43 |
|
|
|
44 |
|
|
system("/sbin/e-smith/expand-template /home/e-smith/ssl.pem/pem"); |
45 |
|
|
- system("/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf"); |
46 |
|
|
- system("/sbin/service httpd-e-smith restart"); |
47 |
|
|
- system("/sbin/e-smith/signal-event ldap-update"); |
48 |
|
|
- system("/sbin/e-smith/signal-event email-update"); |
49 |
|
|
+ # system("/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf"); |
50 |
|
|
+ # system("/sbin/service httpd-e-smith restart"); |
51 |
|
|
+ # system("/sbin/e-smith/signal-event ldap-update"); |
52 |
|
|
+ # system("/sbin/e-smith/signal-event email-update"); |
53 |
|
|
+ |
54 |
|
|
+ system("/sbin/e-smith/signal-event ssl-update"); |
55 |
|
|
|
56 |
|
|
if (( -f $crt_path) && ( -f $key_path )) { |
57 |
|
|
system("/bin/rm $ssl_crt/$domain.crt"); |
58 |
|
|
@@ -146,12 +148,14 @@ |
59 |
|
|
} |
60 |
|
|
|
61 |
|
|
system("/sbin/e-smith/expand-template /home/e-smith/ssl.pem/pem"); |
62 |
|
|
- system("/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf"); |
63 |
|
|
- #system("/sbin/service httpd-e-smith restart >/dev/null 2>&1"); |
64 |
|
|
- system("/sbin/service httpd-e-smith restart"); |
65 |
|
|
+ # system("/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf"); |
66 |
|
|
+ # system("/sbin/service httpd-e-smith restart >/dev/null 2>&1"); |
67 |
|
|
+ # system("/sbin/service httpd-e-smith restart"); |
68 |
|
|
+ # system("/sbin/e-smith/signal-event ldap-update"); |
69 |
|
|
+ # system("/sbin/e-smith/signal-event email-update"); |
70 |
|
|
+ |
71 |
|
|
+ system("/sbin/e-smith/signal-event ssl-update"); |
72 |
|
|
|
73 |
|
|
- system("/sbin/e-smith/signal-event ldap-update"); |
74 |
|
|
- system("/sbin/e-smith/signal-event email-update"); |
75 |
|
|
#$fm->success('SUCCESS','FIRST'); |
76 |
|
|
return undef; |
77 |
|
|
} |