From cc8439566fe50485b487e1638f849774a5e84427 Mon Sep 17 00:00:00 2001
From: Adrien DAURIAT <16813527+dauriata@users.noreply.github.com>
Date: Wed, 30 Jan 2019 23:32:51 +0100
Subject: [PATCH] acme: Fix loading credentials

Move loading credential function before cert renewal call as credentials might be needed for some renewal operations ( ex: DNS )

Signed-off-by: Adrien DAURIAT <16813527+dauriata@users.noreply.github.com>
---
 net/acme/Makefile     |  2 +-
 net/acme/files/run.sh | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/acme/Makefile b/net/acme/Makefile
index 205b5f122..a6d618bed 100644
--- a/net/acme/Makefile
+++ b/net/acme/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme
 PKG_VERSION:=2.7.8
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_LICENSE:=GPLv3
 
 PKG_SOURCE_PROTO:=git
diff --git a/net/acme/files/run.sh b/net/acme/files/run.sh
index 368de26d3..0d3d5c55e 100644
--- a/net/acme/files/run.sh
+++ b/net/acme/files/run.sh
@@ -163,6 +163,12 @@ issue_cert()
     [ -n "$webroot" ] || [ -n "$dns" ] || pre_checks "$main_domain" || return 1
 
     log "Running ACME for $main_domain"
+    
+    handle_credentials() {
+        local credential="$1"
+        eval export $credential
+    }
+    config_list_foreach "$section" credentials handle_credentials
 
     if [ -e "$STATE_DIR/$main_domain" ]; then
         if [ "$use_staging" -eq "0" ] && is_staging "$main_domain"; then
@@ -197,12 +203,6 @@ issue_cert()
         acme_args="$acme_args --webroot $webroot"
     fi
 
-    handle_credentials() {
-        local credential="$1"
-        eval export $credential
-    }
-    config_list_foreach "$section" credentials handle_credentials
-
     if ! $ACME --home "$STATE_DIR" --issue $acme_args; then
         failed_dir="$STATE_DIR/${main_domain}.failed-$(date +%s)"
         err "Issuing cert for $main_domain failed. Moving state to $failed_dir"