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

Merge pull request #3 from AlvinSchiller/dev

Browse Source 
Save domain dependent values in domain.conf
This commit is contained in:
Marvo2011 2022-05-03 09:17:22 +02:00 committed by GitHub
commit a092a2fa43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dnsapi/dns_selfhost.sh
View File

@ -12,23 +12,25 @@ dns_selfhost_add() {
_debug txtvalue "$txt"
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_PASSWORD="${SELFHOSTDNS_PASSWORD:-$(_readaccountconf_mutable SELFHOSTDNS_PASSWORD)}"
SELFHOSTDNS_MAP="${SELFHOSTDNS_MAP:-$(_readaccountconf_mutable SELFHOSTDNS_MAP)}"
SELFHOSTDNS_RID="${SELFHOSTDNS_RID:-$(_readaccountconf_mutable SELFHOSTDNS_RID)}"
SELFHOSTDNS_RID2="${SELFHOSTDNS_RID2:-$(_readaccountconf_mutable SELFHOSTDNS_RID2)}"
SELFHOSTDNS_LAST_SLOT="$(_readaccountconf_mutable SELFHOSTDNS_LAST_SLOT)"
# These values are domain dependent, so read them from there
_getdeployconf SELFHOSTDNS_MAP
_getdeployconf SELFHOSTDNS_RID
_getdeployconf SELFHOSTDNS_RID2
_getdeployconf SELFHOSTDNS_LAST_SLOT
if [ -z "${SELFHOSTDNS_USERNAME:-}" ] || [ -z "${SELFHOSTDNS_PASSWORD:-}" ]; then
_err "SELFHOSTDNS_USERNAME and SELFHOSTDNS_PASSWORD must be set"
return 1
fi
if test -z "$SELFHOSTDNS_LAST_SLOT"; then
SELFHOSTDNS_LAST_SLOT=1
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:")
if test -z "$rid"; then
@ -41,7 +43,10 @@ dns_selfhost_add() {
fi
fi
_saveaccountconf_mutable SELFHOSTDNS_LAST_SLOT "$SELFHOSTDNS_LAST_SLOT"
if test -z "$rid"; then
_err "SELFHOSTDNS_RID and SELFHOSTDNS_RID2, or SELFHOSTDNS_MAP must be set"
return 1
fi
_info "Trying to add $txt on selfhost for rid: $rid"
@ -52,6 +57,15 @@ dns_selfhost_add() {
_err "Invalid response of acme-dns for selfhost"
return 1
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() {