From 789d868e89e68f76b6669126fa7ccf7485a8202d Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 27 Jun 2016 17:37:36 +0200
Subject: [PATCH] Fix deploy hook on sme8 There was two problems: the manual
 expand-template for the pem file was wrong, and the
 smeserver-letsencrypt-client rpm provided the /etc/e-smith/event/ssl-update
 event. So the test for it not existing was always false. But this event did
 nothing except expand a single config template, no ssl cert was being updated

---
 createlinks                                                | 2 +-
 root/etc/letsencrypt.sh/hooks_deploy_cert.d/10smeserver.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/createlinks b/createlinks
index 59ef43e..991af80 100644
--- a/createlinks
+++ b/createlinks
@@ -2,7 +2,7 @@
 
 use esmith::Build::CreateLinks qw(:all);
 
-templates2events("/etc/letsencrypt.sh/config", qw(letsencrypt-update ssl-update bootstrap-console-save));
+templates2events("/etc/letsencrypt.sh/config", qw(letsencrypt-update bootstrap-console-save));
 templates2events("/etc/cron.daily/letsencrypt.sh", qw(letsencrypt-update));
 templates2events("/etc/letsencrypt.sh/domains.txt",
                  qw(
diff --git a/root/etc/letsencrypt.sh/hooks_deploy_cert.d/10smeserver.sh b/root/etc/letsencrypt.sh/hooks_deploy_cert.d/10smeserver.sh
index 432c01b..6face4b 100644
--- a/root/etc/letsencrypt.sh/hooks_deploy_cert.d/10smeserver.sh
+++ b/root/etc/letsencrypt.sh/hooks_deploy_cert.d/10smeserver.sh
@@ -30,7 +30,7 @@ fi
 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 /home/e-smith/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