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

Merge pull request #6093 from acmesh-official/dev

Browse Source 
sync
This commit is contained in:
neil 2024-11-11 22:43:23 +01:00 committed by GitHub
commit 35632f2109
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
acme.sh
View File

@ -1442,7 +1442,7 @@ _toPkcs() {
else else
${ACME_OPENSSL_BIN:-openssl} pkcs12 -export -out "$_cpfx" -inkey "$_ckey" -in "$_ccert" -certfile "$_cca" ${ACME_OPENSSL_BIN:-openssl} pkcs12 -export -out "$_cpfx" -inkey "$_ckey" -in "$_ccert" -certfile "$_cca"
fi fi
if [ "$?" == "0" ]; then if [ "$?" = "0" ]; then
_savedomainconf "Le_PFXPassword" "$pfxPassword" _savedomainconf "Le_PFXPassword" "$pfxPassword"
fi fi
@ -2193,7 +2193,6 @@ _send_signed_request() {
_debug2 _headers "$_headers" _debug2 _headers "$_headers"
_CACHED_NONCE="$(echo "$_headers" | grep -i "Replay-Nonce:" | _head_n 1 | tr -d "\r\n " | cut -d ':' -f 2)" _CACHED_NONCE="$(echo "$_headers" | grep -i "Replay-Nonce:" | _head_n 1 | tr -d "\r\n " | cut -d ':' -f 2)"
fi fi
_debug2 _CACHED_NONCE "$_CACHED_NONCE"
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
_err "Cannot connect to $nonceurl to get nonce." _err "Cannot connect to $nonceurl to get nonce."
return 1 return 1

15
dnsapi/dns_alviy.sh
View File

@ -1,11 +1,12 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# Alviy domain api # shellcheck disable=SC2034
# dns_alviy_info='Alviy.com
# Get API key and secret from https://cloud.alviy.com/token Site: Alviy.com
# Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_alviy
# Alviy_token="some-secret-key" Options:
# Alviy_token API token. Get it from the https://cloud.alviy.com/token
# Ex.: acme.sh --issue --staging --dns dns_alviy -d "*.s.example.com" -d "s.example.com" Issues: github.com/acmesh-official/acme.sh/issues/5115
'
Alviy_Api="https://cloud.alviy.com/api/v1" Alviy_Api="https://cloud.alviy.com/api/v1"

14
dnsapi/dns_ionos_cloud.sh
View File

@ -1,12 +1,14 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# shellcheck disable=SC2034
dns_ionos_cloud_info='IONOS Cloud DNS
Site: ionos.com
Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_ionos_cloud
Options:
IONOS_TOKEN API Token.
Issues: github.com/acmesh-official/acme.sh/issues/5243
'
# Supports IONOS Cloud DNS API v1.15.4 # Supports IONOS Cloud DNS API v1.15.4
#
# Usage:
# Export IONOS_TOKEN before calling acme.sh:
# $ export IONOS_TOKEN="..."
#
# $ acme.sh --issue --dns dns_ionos_cloud ...
IONOS_CLOUD_API="https://dns.de-fra.ionos.com" IONOS_CLOUD_API="https://dns.de-fra.ionos.com"
IONOS_CLOUD_ROUTE_ZONES="/zones" IONOS_CLOUD_ROUTE_ZONES="/zones"

3
dnsapi/dns_miab.sh
View File

@ -16,8 +16,7 @@ Author: Darven Dissek, William Gertz
#Usage: dns_miab_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" #Usage: dns_miab_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
dns_miab_add() { dns_miab_add() {
fulldomain=$1 fulldomain=$1
# Added "value=" and "&ttl=300" to accomodate the new TXT record format used by the MIAB/PMIAB API txtvalue=$2
txtvalue="value=$2&ttl=300"
_info "Using miab challenge add" _info "Using miab challenge add"
_debug fulldomain "$fulldomain" _debug fulldomain "$fulldomain"
_debug txtvalue "$txtvalue" _debug txtvalue "$txtvalue"

20
dnsapi/dns_omglol.sh
View File

@ -1,23 +1,19 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# shellcheck disable=SC2034 # shellcheck disable=SC2034
dns_myapi_info='omg.lol dns_omglol_info='omg.lol
Based on the omg.lol API, defined at https://api.omg.lol/ Site: omg.lol
Domains: omg.lol Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_omglol
Site: github.com/acmesh-official/acme.sh/wiki/DNS-API-Dev-Guide
Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_duckdns
Options: Options:
OMG_ApiKey API Key from omg.lol. This is accesible from the bottom of the account page at https://home.omg.lol/account OMG_ApiKey API Key from omg.lol. This is accessible from the bottom of the account page at https://home.omg.lol/account
OMG_Address This is your omg.lol address, without the preceding @ - you can see your list on your dashboard at https://home.omg.lol/dashboard OMG_Address This is your omg.lol address, without the preceding @ - you can see your list on your dashboard at https://home.omg.lol/dashboard
Issues: github.com/acmesh-official/acme.sh Issues: github.com/acmesh-official/acme.sh/issues/5299
Author: @Kholin <kholin+acme.omglolapi@omg.lol> Author: @Kholin <kholin+acme.omglolapi@omg.lol>
' '
#returns 0 means success, otherwise error. # See API Docs https://api.omg.lol/
######## Public functions ##################### ######## Public functions #####################
# Please Read this guide first: https://github.com/acmesh-official/acme.sh/wiki/DNS-API-Dev-Guide
#Usage: dns_myapi_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" #Usage: dns_myapi_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
dns_omglol_add() { dns_omglol_add() {
fulldomain=$1 fulldomain=$1
@ -244,8 +240,8 @@ omg_delete() {
omg_validate_delete "$output" omg_validate_delete "$output"
} }
# Validate the response on request to delete. Confirm stastus is success and # Validate the response on request to delete.
# Message indicates deletion was successful # Confirm status is success and message indicates deletion was successful.
# Input: Response - HTTP response received from delete request # Input: Response - HTTP response received from delete request
omg_validate_delete() { omg_validate_delete() {
response=$1 response=$1

18
dnsapi/dns_pdns.sh
View File

@ -20,6 +20,11 @@ dns_pdns_add() {
fulldomain=$1 fulldomain=$1
txtvalue=$2 txtvalue=$2
PDNS_Url="${PDNS_Url:-$(_readaccountconf_mutable PDNS_Url)}"
PDNS_ServerId="${PDNS_ServerId:-$(_readaccountconf_mutable PDNS_ServerId)}"
PDNS_Token="${PDNS_Token:-$(_readaccountconf_mutable PDNS_Token)}"
PDNS_Ttl="${PDNS_Ttl:-$(_readaccountconf_mutable PDNS_Ttl)}"
if [ -z "$PDNS_Url" ]; then if [ -z "$PDNS_Url" ]; then
PDNS_Url="" PDNS_Url=""
_err "You don't specify PowerDNS address." _err "You don't specify PowerDNS address."
@ -46,12 +51,12 @@ dns_pdns_add() {
fi fi
#save the api addr and key to the account conf file. #save the api addr and key to the account conf file.
_saveaccountconf PDNS_Url "$PDNS_Url" _saveaccountconf_mutable PDNS_Url "$PDNS_Url"
_saveaccountconf PDNS_ServerId "$PDNS_ServerId" _saveaccountconf_mutable PDNS_ServerId "$PDNS_ServerId"
_saveaccountconf PDNS_Token "$PDNS_Token" _saveaccountconf_mutable PDNS_Token "$PDNS_Token"
if [ "$PDNS_Ttl" != "$DEFAULT_PDNS_TTL" ]; then if [ "$PDNS_Ttl" != "$DEFAULT_PDNS_TTL" ]; then
_saveaccountconf PDNS_Ttl "$PDNS_Ttl" _saveaccountconf_mutable PDNS_Ttl "$PDNS_Ttl"
fi fi
_debug "Detect root zone" _debug "Detect root zone"
@ -73,6 +78,11 @@ dns_pdns_rm() {
fulldomain=$1 fulldomain=$1
txtvalue=$2 txtvalue=$2
PDNS_Url="${PDNS_Url:-$(_readaccountconf_mutable PDNS_Url)}"
PDNS_ServerId="${PDNS_ServerId:-$(_readaccountconf_mutable PDNS_ServerId)}"
PDNS_Token="${PDNS_Token:-$(_readaccountconf_mutable PDNS_Token)}"
PDNS_Ttl="${PDNS_Ttl:-$(_readaccountconf_mutable PDNS_Ttl)}"
if [ -z "$PDNS_Ttl" ]; then if [ -z "$PDNS_Ttl" ]; then
PDNS_Ttl="$DEFAULT_PDNS_TTL" PDNS_Ttl="$DEFAULT_PDNS_TTL"
fi fi

21
dnsapi/dns_timeweb.sh
View File

@ -1,16 +1,13 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# shellcheck disable=SC2034
# acme.sh DNS API for Timeweb Cloud provider (https://timeweb.cloud). dns_timeweb_info='Timeweb.Cloud
# Site: Timeweb.Cloud
# Author: https://github.com/nikolaypronchev. Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_timeweb
# Options:
# Prerequisites: TW_Token API JWT token. Get it from the control panel at https://timeweb.cloud/my/api-keys
# Timeweb Cloud API JWT token. Obtain one from the Timeweb Cloud control panel Issues: github.com/acmesh-official/acme.sh/issues/5140
# ("API and Terraform" section: https://timeweb.cloud/my/api-keys). The JWT token Author: Nikolay Pronchev <https://github.com/nikolaypronchev>
# must be provided to this script in one of two ways: '
# 1. As the "TW_Token" variable, for example: "export TW_Token=eyJhbG...zUxMiIs";
# 2. As a "TW_Token" config entry in acme.sh account config file
# (usually located at ~/.acme.sh/account.conf by default).
TW_Api="https://api.timeweb.cloud/api/v1" TW_Api="https://api.timeweb.cloud/api/v1"