From fa5b40587bdfcc59ada388945c141b2011c6640d Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 25 Jan 2016 15:13:46 +0100 Subject: [PATCH] Move hook script to /etc/letsencrypt.sh/hooks_deploy_cert.d And also make it working on older SME (without ssl-update event) --- .../hooks_deploy_cert.d/smeserver.sh} | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) rename root/{sbin/e-smith/le_hook.sh => etc/letsencrypt.sh/hooks_deploy_cert.d/smeserver.sh} (50%) diff --git a/root/sbin/e-smith/le_hook.sh b/root/etc/letsencrypt.sh/hooks_deploy_cert.d/smeserver.sh similarity index 50% rename from root/sbin/e-smith/le_hook.sh rename to root/etc/letsencrypt.sh/hooks_deploy_cert.d/smeserver.sh index c73dc4e..64db3ba 100644 --- a/root/sbin/e-smith/le_hook.sh +++ b/root/etc/letsencrypt.sh/hooks_deploy_cert.d/smeserver.sh @@ -9,7 +9,26 @@ if [[ "$ACTION" == "deploy_cert" ]]; then CRT=${4} CHAIN=${5} /sbin/e-smith/db configuration setprop modSSL key $KEY crt $CRT CertificateChainFile $CHAIN - /sbin/e-smith/signal-event ssl-update + # There's a new ssl-udpate event which update everything in a single event + # fallback to manual operations if this event doesn't exist + if [ -d /etc/e-smith/events/ssl-update ]; then + /sbin/e-smith/signal-event ssl-update + else + /sbin/e-smith/expand-template /home/e-smith/db/ssl.pem/pem + /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf + /sbin/e-smith/expand-template /var/service/qpsmtpd/ssl/cert.pem + /usr/bin/sv 1 /service/httpd-e-smith + /usr/bin/sv h /service/ldap + /usr/bin/sv 1 /service/pop3s + /usr/bin/sv h /service/qpsmtpd + /usr/bin/sv h /service/sqpsmtpd + if [ -d /service/dovecot ]; then + /usr/bin/sv 1 /service/dovecot + /usr/bin/sv h /service/dovecot + else + /usr/bin/sv 1 /service/imaps + fi + fi # Now revoke old certificates CUR_CRT=$(readlink /home/e-smith/db/letsencrypt.sh/certs/$DOM/cert.pem) for cert in $(find /home/e-smith/db/letsencrypt.sh/certs/$DOM/ -type f -name cert\*.pem -exec basename "{}" \;); do