Merge branch 'dev' of github.com:Neilpang/acme.sh into dev
This commit is contained in:
commit
468edfa6cc
@ -85,30 +85,27 @@ routeros_deploy() {
|
||||
scp "$_ckey" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.key"
|
||||
_info "Trying to push cert '$_cfullchain' to router"
|
||||
scp "$_cfullchain" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.cer"
|
||||
DEPLOY_SCRIPT_CMD="/system script add name=\"LE Cert Deploy - $_cdomain\" owner=admin policy=ftp,read,write,password,sensitive
|
||||
source=\"## generated by routeros deploy script in acme.sh
|
||||
\n/certificate remove [ find name=$_cdomain.cer_0 ]
|
||||
\n/certificate remove [ find name=$_cdomain.cer_1 ]
|
||||
\ndelay 1
|
||||
\n/certificate import file-name=$_cdomain.cer passphrase=\\\"\\\"
|
||||
\n/certificate import file-name=$_cdomain.key passphrase=\\\"\\\"
|
||||
\ndelay 1
|
||||
\n/file remove $_cdomain.cer
|
||||
\n/file remove $_cdomain.key
|
||||
\ndelay 2
|
||||
\n/ip service set www-ssl certificate=$_cdomain.cer_0
|
||||
\n$ROUTER_OS_ADDITIONAL_SERVICES
|
||||
\n\"
|
||||
"
|
||||
# shellcheck disable=SC2029
|
||||
ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" bash -c "'
|
||||
ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "$DEPLOY_SCRIPT_CMD"
|
||||
# shellcheck disable=SC2029
|
||||
ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script run \"LE Cert Deploy - $_cdomain\""
|
||||
# shellcheck disable=SC2029
|
||||
ssh "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST" "/system script remove \"LE Cert Deploy - $_cdomain\""
|
||||
|
||||
/certificate remove $_cdomain.cer_0
|
||||
|
||||
/certificate remove $_cdomain.cer_1
|
||||
|
||||
delay 1
|
||||
|
||||
/certificate import file-name=$_cdomain.cer passphrase=\"\"
|
||||
|
||||
/certificate import file-name=$_cdomain.key passphrase=\"\"
|
||||
|
||||
delay 1
|
||||
|
||||
/file remove $_cdomain.cer
|
||||
|
||||
/file remove $_cdomain.key
|
||||
|
||||
delay 2
|
||||
|
||||
/ip service set www-ssl certificate=$_cdomain.cer_0
|
||||
$ROUTER_OS_ADDITIONAL_SERVICES
|
||||
|
||||
'"
|
||||
return 0
|
||||
}
|
||||
|
63
dnsapi/dns_regru.sh
Normal file
63
dnsapi/dns_regru.sh
Normal file
@ -0,0 +1,63 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# REGRU_API_Username="test"
|
||||
#
|
||||
# REGRU_API_Password="test"
|
||||
#
|
||||
_domain=$_domain
|
||||
|
||||
REGRU_API_URL="https://api.reg.ru/api/regru2"
|
||||
|
||||
######## Public functions #####################
|
||||
|
||||
dns_regru_add() {
|
||||
fulldomain=$1
|
||||
txtvalue=$2
|
||||
|
||||
REGRU_API_Username="${REGRU_API_Username:-$(_readaccountconf_mutable REGRU_API_Username)}"
|
||||
REGRU_API_Password="${REGRU_API_Password:-$(_readaccountconf_mutable REGRU_API_Password)}"
|
||||
if [ -z "$REGRU_API_Username" ] || [ -z "$REGRU_API_Password" ]; then
|
||||
REGRU_API_Username=""
|
||||
REGRU_API_Password=""
|
||||
_err "You don't specify regru password or username."
|
||||
return 1
|
||||
fi
|
||||
|
||||
_saveaccountconf_mutable REGRU_API_Username "$REGRU_API_Username"
|
||||
_saveaccountconf_mutable REGRU_API_Password "$REGRU_API_Password"
|
||||
|
||||
_info "Adding TXT record to ${fulldomain}"
|
||||
response="$(_get "$REGRU_API_URL/zone/add_txt?input_data={%22username%22:%22${REGRU_API_Username}%22,%22password%22:%22${REGRU_API_Password}%22,%22domains%22:[{%22dname%22:%22${_domain}%22}],%22subdomain%22:%22_acme-challenge%22,%22text%22:%22${txtvalue}%22,%22output_content_type%22:%22plain%22}&input_format=json")"
|
||||
|
||||
if _contains "${response}" 'success'; then
|
||||
return 0
|
||||
fi
|
||||
_err "Could not create resource record, check logs"
|
||||
_err "${response}"
|
||||
return 1
|
||||
}
|
||||
|
||||
dns_regru_rm() {
|
||||
fulldomain=$1
|
||||
txtvalue=$2
|
||||
|
||||
REGRU_API_Username="${REGRU_API_Username:-$(_readaccountconf_mutable REGRU_API_Username)}"
|
||||
REGRU_API_Password="${REGRU_API_Password:-$(_readaccountconf_mutable REGRU_API_Password)}"
|
||||
if [ -z "$REGRU_API_Username" ] || [ -z "$REGRU_API_Password" ]; then
|
||||
REGRU_API_Username=""
|
||||
REGRU_API_Password=""
|
||||
_err "You don't specify regru password or username."
|
||||
return 1
|
||||
fi
|
||||
|
||||
_info "Deleting resource record $fulldomain"
|
||||
response="$(_get "$REGRU_API_URL/zone/remove_record?input_data={%22username%22:%22${REGRU_API_Username}%22,%22password%22:%22${REGRU_API_Password}%22,%22domains%22:[{%22dname%22:%22${_domain}%22}],%22subdomain%22:%22_acme-challenge%22,%22content%22:%22${txtvalue}%22,%22record_type%22:%22TXT%22,%22output_content_type%22:%22plain%22}&input_format=json")"
|
||||
|
||||
if _contains "${response}" 'success'; then
|
||||
return 0
|
||||
fi
|
||||
_err "Could not delete resource record, check logs"
|
||||
_err "${response}"
|
||||
return 1
|
||||
}
|
Loading…
Reference in New Issue
Block a user