nihilist/acme.sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save domain dependent values in domain.conf after successfull use

Browse Source
This commit is contained in:
AlvinSchiller 2022-04-29 22:26:36 +02:00
parent 96d45cc341
commit 610c3cf681
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dnsapi/dns_selfhost.sh
View File

@ -12,12 +12,15 @@ dns_selfhost_add() {
_debug txtvalue "$txt" _debug txtvalue "$txt"
SELFHOSTDNS_UPDATE_URL="https://selfhost.de/cgi-bin/api.pl" SELFHOSTDNS_UPDATE_URL="https://selfhost.de/cgi-bin/api.pl"
# Get values, but don't save until we successfully validated
SELFHOSTDNS_USERNAME="${SELFHOSTDNS_USERNAME:-$(_readaccountconf_mutable SELFHOSTDNS_USERNAME)}" SELFHOSTDNS_USERNAME="${SELFHOSTDNS_USERNAME:-$(_readaccountconf_mutable SELFHOSTDNS_USERNAME)}"
SELFHOSTDNS_PASSWORD="${SELFHOSTDNS_PASSWORD:-$(_readaccountconf_mutable SELFHOSTDNS_PASSWORD)}" SELFHOSTDNS_PASSWORD="${SELFHOSTDNS_PASSWORD:-$(_readaccountconf_mutable SELFHOSTDNS_PASSWORD)}"
SELFHOSTDNS_MAP="${SELFHOSTDNS_MAP:-$(_readaccountconf_mutable SELFHOSTDNS_MAP)}" # These values are domain dependent, so read them from there
SELFHOSTDNS_RID="${SELFHOSTDNS_RID:-$(_readaccountconf_mutable SELFHOSTDNS_RID)}" _getdeployconf SELFHOSTDNS_MAP
SELFHOSTDNS_RID2="${SELFHOSTDNS_RID2:-$(_readaccountconf_mutable SELFHOSTDNS_RID2)}" _getdeployconf SELFHOSTDNS_RID
SELFHOSTDNS_LAST_SLOT="$(_readaccountconf_mutable SELFHOSTDNS_LAST_SLOT)" _getdeployconf SELFHOSTDNS_RID2
_getdeployconf SELFHOSTDNS_LAST_SLOT
if [ -z "${SELFHOSTDNS_USERNAME:-}" ] || [ -z "${SELFHOSTDNS_PASSWORD:-}" ]; then if [ -z "${SELFHOSTDNS_USERNAME:-}" ] || [ -z "${SELFHOSTDNS_PASSWORD:-}" ]; then
_err "SELFHOSTDNS_USERNAME and SELFHOSTDNS_PASSWORD must be set" _err "SELFHOSTDNS_USERNAME and SELFHOSTDNS_PASSWORD must be set"
@ -28,12 +31,6 @@ dns_selfhost_add() {
SELFHOSTDNS_LAST_SLOT=1 SELFHOSTDNS_LAST_SLOT=1
fi fi
_saveaccountconf_mutable SELFHOSTDNS_USERNAME "$SELFHOSTDNS_USERNAME"
_saveaccountconf_mutable SELFHOSTDNS_PASSWORD "$SELFHOSTDNS_PASSWORD"
_saveaccountconf_mutable SELFHOSTDNS_MAP "$SELFHOSTDNS_MAP"
_saveaccountconf_mutable SELFHOSTDNS_RID "$SELFHOSTDNS_RID"
_saveaccountconf_mutable SELFHOSTDNS_RID2 "$SELFHOSTDNS_RID2"
rid=$(echo "$SELFHOSTDNS_MAP" | grep -Eoi "$domain:(\d+)" | tr -d "$domain:") rid=$(echo "$SELFHOSTDNS_MAP" | grep -Eoi "$domain:(\d+)" | tr -d "$domain:")
if test -z "$rid"; then if test -z "$rid"; then
@ -51,8 +48,6 @@ dns_selfhost_add() {
return 1 return 1
fi fi
_saveaccountconf_mutable SELFHOSTDNS_LAST_SLOT "$SELFHOSTDNS_LAST_SLOT"
_info "Trying to add $txt on selfhost for rid: $rid" _info "Trying to add $txt on selfhost for rid: $rid"
data="?username=$SELFHOSTDNS_USERNAME&password=$SELFHOSTDNS_PASSWORD&rid=$rid&content=$txt" data="?username=$SELFHOSTDNS_USERNAME&password=$SELFHOSTDNS_PASSWORD&rid=$rid&content=$txt"
@ -62,6 +57,15 @@ dns_selfhost_add() {
_err "Invalid response of acme-dns for selfhost" _err "Invalid response of acme-dns for selfhost"
return 1 return 1
fi fi
# Now that we know the values are good, save them
_saveaccountconf_mutable SELFHOSTDNS_USERNAME "$SELFHOSTDNS_USERNAME"
_saveaccountconf_mutable SELFHOSTDNS_PASSWORD "$SELFHOSTDNS_PASSWORD"
# These values are domain dependent, so store them there
_savedeployconf SELFHOSTDNS_MAP "$SELFHOSTDNS_MAP"
_savedeployconf SELFHOSTDNS_RID "$SELFHOSTDNS_RID"
_savedeployconf SELFHOSTDNS_RID2 "$SELFHOSTDNS_RID2"
_savedeployconf SELFHOSTDNS_LAST_SLOT "$SELFHOSTDNS_LAST_SLOT"
} }
dns_selfhost_rm() { dns_selfhost_rm() {