diff -urN smeserver-certificate-0.0.4.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/certificate smeserver-certificate-0.0.4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/certificate
--- smeserver-certificate-0.0.4.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/certificate 2022-03-29 09:05:33.234160837 +0100
+++ smeserver-certificate-0.0.4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/certificate 2022-03-29 09:25:55.018379093 +0100
@@ -54,5 +54,16 @@
LABEL_CERTIFICATE_CHAINFILE
SSL intermediate chain certificate
+
+
+ SUCCESS-CERT-WRITTEN
+ Success - New Certificate details written
+
+
+
+ SUCCESS-CERT-DEFAULTED
+ Success - Certificate reverted to self-signed
+
+
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
--- smeserver-certificate-0.0.4.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm 2022-03-29 09:05:33.252161018 +0100
+++ smeserver-certificate-0.0.4/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/certificate.pm 2022-03-29 09:24:47.831709075 +0100
@@ -52,7 +52,7 @@
$pem = "chain.pem";
}
if (! open (PEM, "<$dir/$pem")){
- $fm->error('ERROR_OPEN_PEM','FIRST');
+ #$fm->error('ERROR_OPEN_PEM','FIRST');
# Tell the user something bad has happened
return;
}
@@ -104,12 +104,14 @@
system("/bin/rm $ssl_key/$domain.key");
system("/bin/rm $ssl_crt/chain.pem");
}
+ $fm->success('SUCCESS-CERT-DEFAULTED','FIRST');
+
}
elsif (($domain_crt ne '') && ($domain_key ne ''))
{
if (! open (CRT, ">$ssl_crt/$domain.crt")){
- $fm->error('ERROR_OPEN_CRT','FIRST');
+ $fm->error('ERROR_OPEN_KEY','FIRST');
# Tell the user something bad has happened
return;
}
@@ -156,8 +158,8 @@
system("/sbin/e-smith/signal-event ssl-update");
- #$fm->success('SUCCESS','FIRST');
- return undef;
+ $fm->success('SUCCESS-CERT-WRITTEN','FIRST');
+ #return undef;
}
}
1;