acme: fix staging option

Legacy use_staging option was not respected, and the example config
still use the legacy name.

Signed-off-by: Glen Huang <i@glenhuang.com>

diff --git a/net/acme-common/files/acme.config b/net/acme-common/files/acme.config
index 12bffd60f7a8852cfd4253aada23d4f061788970..d72547a6ed17c42f87e73254ce8e28ab192185ea 100644 (file)
--- a/net/acme-common/files/acme.config
+++ b/net/acme-common/files/acme.config
@@ -5,7 +5,7 @@ config acme
 
 config cert 'example_wildcard'
        option enabled 0
-       option use_staging 1
+       option staging 1
        list domains example.org
        list domains sub.example.org
        list domains *.sub.example.org
@@ -17,6 +17,6 @@ config cert 'example_wildcard'
 
 config cert 'example'
        option enabled 0
-       option use_staging 1
+       option staging 1
        list domains example.org
        list domains sub.example.org

diff --git a/net/acme-common/files/acme.sh b/net/acme-common/files/acme.sh
index 141a2a2cf6e041af22b7e735928a020ce1fa43b7..24601a5025fbe2882e90d92abcf4a41ab8b2cd18 100644 (file)
--- a/net/acme-common/files/acme.sh
+++ b/net/acme-common/files/acme.sh
@@ -36,7 +36,7 @@ load_options() {
        section=$1
 
        # compatibility for old option name
-       config_get_bool use_staging "$section" staging
+       config_get_bool staging "$section" use_staging
        if [ -z "$staging" ]; then
                config_get_bool staging "$section" staging 0
        fi