From 28590c301bb93a294af4c8a00af81a9d03040fbf Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Fri, 26 Jan 2024 16:07:49 +0900
Subject: [PATCH] Fix crash running /app/force_renew

---
 app/entrypoint.sh       | 16 +---------------
 app/functions.sh        | 18 ++++++++++++++++++
 app/letsencrypt_service |  2 ++
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/entrypoint.sh b/app/entrypoint.sh
index 63fd9df..f1ef836 100755
--- a/app/entrypoint.sh
+++ b/app/entrypoint.sh
@@ -6,21 +6,7 @@ set -u
 # shellcheck source=functions.sh
 source /app/functions.sh
 
-if [[ "$ACME_CA_URI" == "https://acme-v01.api.letsencrypt.org/directory" ]] || \
-    [[ "$ACME_CA_URI" == "production" ]] || \
-    [[ "$ACME_CA_URI" == "prod" ]]; then
-    original_acme="$ACME_CA_URI"
-    export ACME_CA_URI="https://acme-v02.api.letsencrypt.org/directory"
-    echo "Info: Rewriting ACME_CA_URI from $original_acme to $ACME_CA_URI"
-fi
-
-if [[ "$ACME_CA_URI" == "https://acme-staging.api.letsencrypt.org/directory" ]] || \
-   [[ "$ACME_CA_URI" == "staging" ]] || \
-   [[ "$ACME_CA_URI" == "test" ]]; then
-    original_acme="$ACME_CA_URI"
-    export ACME_CA_URI="https://acme-staging-v02.api.letsencrypt.org/directory"
-    echo "Info: Rewriting ACME_CA_URI from $original_acme to $ACME_CA_URI"
-fi
+load_acme_ca_uri
 
 function print_version {
     if [[ -n "${COMPANION_VERSION:-}" ]]; then
diff --git a/app/functions.sh b/app/functions.sh
index 56f03f0..dec1f37 100644
--- a/app/functions.sh
+++ b/app/functions.sh
@@ -429,3 +429,21 @@ function set_ownership_and_permissions {
     return 1
   fi
 }
+
+function load_acme_ca_uri {
+  if [[ "$ACME_CA_URI" == "https://acme-v01.api.letsencrypt.org/directory" ]] || \
+      [[ "$ACME_CA_URI" == "production" ]] || \
+      [[ "$ACME_CA_URI" == "prod" ]]; then
+      original_acme="$ACME_CA_URI"
+      export ACME_CA_URI="https://acme-v02.api.letsencrypt.org/directory"
+      echo "Info: Rewriting ACME_CA_URI from $original_acme to $ACME_CA_URI"
+  fi
+
+  if [[ "$ACME_CA_URI" == "https://acme-staging.api.letsencrypt.org/directory" ]] || \
+    [[ "$ACME_CA_URI" == "staging" ]] || \
+    [[ "$ACME_CA_URI" == "test" ]]; then
+      original_acme="$ACME_CA_URI"
+      export ACME_CA_URI="https://acme-staging-v02.api.letsencrypt.org/directory"
+      echo "Info: Rewriting ACME_CA_URI from $original_acme to $ACME_CA_URI"
+  fi
+}
diff --git a/app/letsencrypt_service b/app/letsencrypt_service
index 12f8291..15a952f 100755
--- a/app/letsencrypt_service
+++ b/app/letsencrypt_service
@@ -3,6 +3,8 @@
 # shellcheck source=functions.sh
 source /app/functions.sh
 
+load_acme_ca_uri
+
 CERTS_UPDATE_INTERVAL="${CERTS_UPDATE_INTERVAL:-3600}"
 ACME_CA_URI="${ACME_CA_URI:-"https://acme-v02.api.letsencrypt.org/directory"}"
 ACME_CA_TEST_URI="https://acme-staging-v02.api.letsencrypt.org/directory"