Browse Source

more beautifying

pull/411/merge^2
hyper 8 years ago
committed by sjau
parent
commit
b1e6109d43
  1. 18
      dnsapi/dns_ispconfig.sh

18
dnsapi/dns_ispconfig.sh

@ -4,7 +4,8 @@
ISPC_User="" ISPC_User=""
ISPC_Password="" ISPC_Password=""
ISPC_Api="https://ispc.domain.tld:8080/remote/json.php" # Provide proper URL and port for your ISPC Installation
# Provide proper URL and port for your ISPC Installation
ISPC_Api="https://ispc.domain.tld:8080/remote/json.php"
######## Public functions ##################### ######## Public functions #####################
@ -56,8 +57,10 @@ _ISPC_getZoneInfo() {
zoneEnd=false zoneEnd=false
curZone="${fulldomain}" curZone="${fulldomain}"
while [ ${zoneEnd} = false ]; do while [ ${zoneEnd} = false ]; do
curZone="${curZone#*.}" # we can strip the first part of the fulldomain, since it's just the _acme-challenge string
curData="{\"session_id\":\"${sessionID}\",\"primary_id\":[{\"origin\":\"${curZone}.\"}]}" # suffix . needed for zone -> domain.tld.
# we can strip the first part of the fulldomain, since it's just the _acme-challenge string
curZone="${curZone#*.}"
# suffix . needed for zone -> domain.tld.
curData="{\"session_id\":\"${sessionID}\",\"primary_id\":[{\"origin\":\"${curZone}.\"}]}"
curResult=$(curl -k --data "${curData}" "${ISPC_Api}?dns_zone_get") curResult=$(curl -k --data "${curData}" "${ISPC_Api}?dns_zone_get")
if _contains "${curResult}" '"id":"'; then if _contains "${curResult}" '"id":"'; then
zoneFound=true zoneFound=true
@ -105,8 +108,10 @@ _ISPC_addTxt() {
record_id=${record_id:1:-2} record_id=${record_id:1:-2}
case ${record_id} in case ${record_id} in
''|*[!0-9]*) _err "Record ID is not numeric." ;; ''|*[!0-9]*) _err "Record ID is not numeric." ;;
*) _info "Successfully retrieved Record ID";
record_data="$record_data $record_id" ;; # Make space seperated string of record IDs for later removal.
*)
_info "Successfully retrieved Record ID";
# Make space seperated string of record IDs for later removal.
record_data="$record_data $record_id" ;;
esac esac
} }
@ -118,7 +123,8 @@ _ISPC_rmTxt() {
if _contains "${curResult}" '"code":"ok"'; then if _contains "${curResult}" '"code":"ok"'; then
_info "Successfully removed ACME challenge txt record." _info "Successfully removed ACME challenge txt record."
else else
_debug "Couldn't remove ACME challenge txt record"; # Setting it to debug only because there's no harm if the txt remains
# Setting it to debug only because there's no harm if the txt remains
_debug "Couldn't remove ACME challenge txt record."
fi fi
done done
} }
Loading…
Cancel
Save