From d3ee50d501482d08276a850a8db74e7c9410c98e Mon Sep 17 00:00:00 2001 From: hyper Date: Mon, 21 Nov 2016 10:10:58 +0100 Subject: [PATCH] some minor corrections --- dnsapi/dns_ispconfig.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dnsapi/dns_ispconfig.sh b/dnsapi/dns_ispconfig.sh index 850bc5ff..6409827c 100755 --- a/dnsapi/dns_ispconfig.sh +++ b/dnsapi/dns_ispconfig.sh @@ -47,11 +47,11 @@ _ISPC_login() { sessionID=${sessionID:1:-2} _info "Successfully retrieved Session ID." else - _err "Couldn't retrieve the Session ID. Aborting."; + _err "Couldn't retrieve the Session ID." fi } -_ISPC_getZoneInfo () { +_ISPC_getZoneInfo() { _info "Getting Zoneinfo" zoneEnd=false curZone="${fulldomain}" @@ -68,26 +68,26 @@ _ISPC_getZoneInfo () { _debug2 "$curZone still contains a '.' - so we can check next higher level" else zoneEnd=true - _err "Couldn't retrieve zone info. Aborting." + _err "Couldn't retrieve zone info." fi done if [ ${zoneFound} ]; then server_id=$(echo "${curResult}" | _egrep_o "server_id.*" | cut -d ':' -f 2) server_id=${server_id:1:-10} case ${server_id} in - ''|*[!0-9]*) _err "Server ID is not numeric. Aborting" ;; + ''|*[!0-9]*) _err "Server ID is not numeric." ;; *) _info "Successfully retrieved Server ID" ;; esac zone=$(echo "${curResult}" | _egrep_o "\"id.*" | cut -d ':' -f 2) zone=${zone:1:-14} case ${zone} in - ''|*[!0-9]*) _err "Zone ID is not numeric. Aborting" ;; + ''|*[!0-9]*) _err "Zone ID is not numeric." ;; *) _info "Successfully retrieved Zone ID" ;; esac client_id=$(echo "${curResult}" | _egrep_o "sys_userid.*" | cut -d ':' -f 2) client_id=${client_id:1:-15} case ${client_id} in - ''|*[!0-9]*) _err "Client ID is not numeric. Aborting" ;; + ''|*[!0-9]*) _err "Client ID is not numeric." ;; *) _info "Successfully retrieved Client ID" ;; esac unset zoneFound @@ -95,7 +95,7 @@ _ISPC_getZoneInfo () { fi } -_ISPC_addTxt () { +_ISPC_addTxt() { curSerial="$(date +%s)" curStamp="$(date +'%F %T')" params="\"server_id\":\"${server_id}\",\"zone\":\"${zone}\",\"name\":\"${fulldomain}\",\"type\":\"txt\",\"data\":\"${txtvalue}\",\"aux\":\"0\",\"ttl\":\"3600\",\"active\":\"y\",\"stamp\":\"${curStamp}\",\"serial\":\"${curSerial}\"" @@ -104,18 +104,18 @@ _ISPC_addTxt () { record_id=$(echo "${curResult}" | _egrep_o "\"response.*" | cut -d ':' -f 2) record_id=${record_id:1:-2} case ${record_id} in - ''|*[!0-9]*) _err "Record ID is not numeric. Aborting" ;; + ''|*[!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. esac } -_ISPC_rmTxt () { +_ISPC_rmTxt() { IFS=" " for i in $record_data; do curData="{\"session_id\":\"${sessionID}\",\"primary_id\":\"${i}\"}" curResult=$(curl -k --data "${curData}" "${ISPC_Api}?dns_txt_delete") - if _contains "${curResult}" '"code":"ok"'; then + if _contains "${curResult}" '"code":"ok"'; then _info "Successfully removed ACME challenge txt record." else _debug "Couldn't remove ACME challenge txt record"; # Setting it to debug only because there's no harm if the txt remains