From cf21b8c68e08aaff8a7de254f99379993243f3b1 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Fri, 20 Jan 2023 23:32:43 -0600
Subject: [PATCH] replace nginx service location in renewal hooks

---
 root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx | 4 ++--
 root/defaults/etc/letsencrypt/renewal-hooks/pre/10-nginx  | 2 +-
 root/etc/s6-overlay/s6-rc.d/init-certbot-config/run       | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx b/root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx
index 781831d..723d69c 100644
--- a/root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx
+++ b/root/defaults/etc/letsencrypt/renewal-hooks/post/10-nginx
@@ -6,10 +6,10 @@
 
 if [[ ! "${ORIGVALIDATION}" = "dns" ]] && [[ ! "${ORIGVALIDATION}" = "duckdns" ]]; then
 	if pgrep -f "s6-supervise nginx" >/dev/null; then
-		s6-svc -u /run/service/nginx
+		s6-svc -u /run/service/svc-nginx
 	fi
 else
 	if pgrep -f "nginx:" >/dev/null; then
-		s6-svc -h /run/service/nginx
+		s6-svc -h /run/service/svc-nginx
 	fi
 fi
diff --git a/root/defaults/etc/letsencrypt/renewal-hooks/pre/10-nginx b/root/defaults/etc/letsencrypt/renewal-hooks/pre/10-nginx
index cb493ea..a8fb50f 100644
--- a/root/defaults/etc/letsencrypt/renewal-hooks/pre/10-nginx
+++ b/root/defaults/etc/letsencrypt/renewal-hooks/pre/10-nginx
@@ -6,6 +6,6 @@
 
 if [[ ! "${ORIGVALIDATION}" = "dns" ]] && [[ ! "${ORIGVALIDATION}" = "duckdns" ]]; then
 	if pgrep -f "nginx:" >/dev/null; then
-		s6-svc -d /run/service/nginx
+		s6-svc -d /run/service/svc-nginx
 	fi
 fi
diff --git a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run
index e1a7d47..5e468eb 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run
@@ -38,6 +38,9 @@ chmod -R +x /defaults/etc/letsencrypt/renewal-hooks
 cp -nR /defaults/etc/letsencrypt/renewal-hooks/* /config/etc/letsencrypt/renewal-hooks/
 lsiown -R abc:abc /config/etc/letsencrypt/renewal-hooks
 
+# replace nginx service location in renewal hooks
+find /config/etc/letsencrypt/renewal-hooks/ -type f -exec sed -i 's|/run/service/nginx|/run/service/svc-nginx|g' {} \;
+
 # create original config file if it doesn't exist, move non-hidden legacy file to hidden
 if [[ -f "/config/donoteditthisfile.conf" ]]; then
     mv /config/donoteditthisfile.conf /config/.donoteditthisfile.conf