uacme: add support for dalias/calias

handle dalias/calias config currectly by dns challenge hook so it won't
break uacme when given

Signed-off-by: Seo Suchan <redacted>

diff --git a/net/uacme/Makefile b/net/uacme/Makefile
index 0e81ca1bf6031a1dda14e12dc99f1b93d8c3db3e..96653d969c56507b81266683dd893b33a59f6556 100644 (file)
--- a/net/uacme/Makefile
+++ b/net/uacme/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uacme
 PKG_VERSION:=1.8.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/ndilieto/uacme/tar.gz/upstream/$(PKG_VERSION)?

diff --git a/net/uacme/files/dnschalhook.sh b/net/uacme/files/dnschalhook.sh
index e9ca8aea388bb116569dad48ea3e78a76a28ae93..3ac3e9d7d6b94756c868ee091ec9dbb28900b837 100755 (executable)
--- a/net/uacme/files/dnschalhook.sh
+++ b/net/uacme/files/dnschalhook.sh
@@ -55,11 +55,18 @@ if [ ! -f "$ACMESH_DNSSCIRPT_DIR/$dns.sh" ]; then
 fi
 . /usr/lib/acme/client/dnsapi/$dns.sh
 echo $dns > "$DOMAIN_CONF_DIR/selected_api"
+
+TXTDOMAIN=_acme-challenge.$IDENT
+if [ "$dalias" ]; then
+    TXTDOMAIN=$dalias
+elif [ "$calias" ]; then
+    TXTDOMAIN=_acme-challenge.$calias
+fi
 case "$METHOD" in
     "begin")
         (umask 077 ; touch -a "$DOMAIN_CONF")
         log info logging $DOMAIN_CONF
-        ${dns}_add _acme-challenge.$IDENT $AUTH
+        ${dns}_add $TXTDOMAIN $AUTH
         RESULT=$?
         if [ $RESULT -eq 0 ]; then
             sleep ${dns_wait:-"30s"}
@@ -69,7 +76,7 @@ case "$METHOD" in
         fi
         ;;
     "done"|"failed")
-        ${dns}_rm _acme-challenge.$IDENT $AUTH
+        ${dns}_rm $TXTDOMAIN $AUTH
         exit $?
         ;;
     *)

diff --git a/net/uacme/files/hook.sh b/net/uacme/files/hook.sh
index 2c0421255d72d06a6328373d91ff0606e7f86eb5..bd51d105e7dc85cb46d8132113df969887bf1dc0 100755 (executable)
--- a/net/uacme/files/hook.sh
+++ b/net/uacme/files/hook.sh
@@ -143,12 +143,12 @@ get)
                export dns
                set -- "$@" -h "$HOOKDIR/client/dnschalhook.sh"
                if [ "$dalias" ]; then
-                       set -- "$@" --domain-alias "$dalias"
+                       export dalias
                        if [ "$calias" ]; then
                                log err "Both domain and challenge aliases are defined. Ignoring the challenge alias."
                        fi
                elif [ "$calias" ]; then
-                       set -- "$@" --challenge-alias "$calias"
+                       export calias
                fi
                if [ "$dns_wait" ]; then
                        export dns_wait

diff --git a/net/uacme/files/test.sh b/net/uacme/files/test.sh
new file mode 100755 (executable)
index 0000000..2e184d5
--- /dev/null
+++ b/net/uacme/files/test.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+case "$1" in
+"uacme")
+    uacme -V 2>&1 | grep "$2"
+    ;;
+"uacme-ualpn")
+    ualpn -V 2>&1 | grep "$2"
+    ;;
+esac