refactoring and fixes

This commit is contained in:
Roman Lumetsberger 2018-09-09 20:47:01 +02:00
parent 66d623b702
commit 63e31196b2

View File

@ -15,29 +15,16 @@ dns_plesk_add() {
fulldomain=$1
txtvalue=$2
PLESK_Host="${CF_Key:-$(_readaccountconf_mutable PLESK_Host)}"
PLESK_User="${CF_Key:-$(_readaccountconf_mutable PLESK_User)}"
PLESK_Password="${CF_Key:-$(_readaccountconf_mutable PLESK_Password)}"
if [ -z "$PLESK_Host" ] || [ -z "$PLESK_User" ] || [ -z "$PLESK_Password"]; then
PLESK_Host=""
PLESK_User=""
PLESK_Password=""
_err "You didn't specify a plesk credentials yet."
_err "Please create the key and try again."
if ! init_config; then
return 1
fi
#save the api key and email to the account conf file.
_saveaccountconf_mutable PLESK_Host "$PLESK_Host"
_saveaccountconf_mutable PLESK_User "$PLESK_User"
_saveaccountconf_mutable PLESK_Password "$PLESK_Password"
_debug "First detect the root zone"
if ! _get_root "$fulldomain"; then
_err "invalid domain"
return 1
fi
_debug _domain_id "$_domain_id"
_debug _sub_domain "$_sub_domain"
_debug _domain "$_domain"
@ -52,11 +39,31 @@ dns_plesk_rm() {
fulldomain=$1
txtvalue=$2
PLESK_Host="${CF_Key:-$(_readaccountconf_mutable PLESK_Host)}"
PLESK_User="${CF_Key:-$(_readaccountconf_mutable PLESK_User)}"
PLESK_Password="${CF_Key:-$(_readaccountconf_mutable PLESK_Password)}"
if ! init_config; then
return 1
fi
if [ -z "$PLESK_Host" ] || [ -z "$PLESK_User" ] || [ -z "$PLESK_Password"]; then
_debug "First detect the root zone"
if ! _get_root "$fulldomain"; then
_err "invalid domain"
return 1
fi
_debug _domain_id "$_domain_id"
_debug _sub_domain "$_sub_domain"
_debug _domain "$_domain"
_info "Remove record"
del_txt_record $_domain_id $fulldomain
}
#################### Private functions below ##################################
function init_config(){
PLESK_Host="${PLESK_Host:-$(_readaccountconf_mutable PLESK_Host)}"
PLESK_User="${PLESK_User:-$(_readaccountconf_mutable PLESK_User)}"
PLESK_Password="${PLESK_Password:-$(_readaccountconf_mutable PLESK_Password)}"
if [ -z "$PLESK_Host" ] || [ -z "$PLESK_User" ] || [ -z "$PLESK_Password" ]; then
PLESK_Host=""
PLESK_User=""
PLESK_Password=""
@ -70,20 +77,8 @@ dns_plesk_rm() {
_saveaccountconf_mutable PLESK_User "$PLESK_User"
_saveaccountconf_mutable PLESK_Password "$PLESK_Password"
_debug "First detect the root zone"
if ! _get_root "$fulldomain"; then
_err "invalid domain"
return 1
fi
_debug _domain_id "$_domain_id"
_debug _sub_domain "$_sub_domain"
_debug _domain "$_domain"
_info "Remove record"
del_txt_record $_domain_id $fulldomain
}
function plesk_api() {
local request="$1"
@ -137,6 +132,7 @@ function del_txt_record() {
return 0
}
#fetches the domain list for the given account
function get_domain_list() {
local request='<packet><customer><get-domain-list><filter></filter></get-domain-list></customer></packet>'
@ -148,10 +144,11 @@ function get_domain_list() {
_plesk_domain_names=($(echo "${response}" | sed -nr 's_<name>(.*)</name>_\1_p'));
_plesk_domain_ids=($(echo "${response}"| sed -nr 's_<id>(.*)</id>_\1_p'));
_plesk_domain_ids=("${_plesk_domain_ids[@]:1}")
_plesk_domain_ids=("${_plesk_domain_ids[@]:1}") #remove first entry because it is the customer id
}
#fetches all dns records fo rthe given sit
function get_dns_record_list() {
local siteid=$1
local request="<packet><dns><get_rec><filter><site-id>$siteid</site-id></filter></get_rec></dns></packet>"
@ -167,20 +164,6 @@ function get_dns_record_list() {
}
#urls=($(sed -nr 's_<id>(.*)</id>_\1_p' resp.txt)); echo ${urls[@]}
#domain.com
#returns
# _plesk_site_id=22
function get_site_id() {
local site_name=$1
request="<packet><site><get><filter><name>$site_name</name></filter><dataset><gen_info/></dataset></get></site></packet>"
plesk_api $request
echo $resonse
_plesk_site_id="$(echo $response | grep -Po '(?<=<id>).*?(?=</id>)')"
return 0
}
#_acme-challenge.www.domain.com
#returns
# _sub_domain=_acme-challenge.www