mirror of
https://github.com/plantroon/acme.sh.git
synced 2024-12-22 13:11:41 +00:00
Merge pull request #2527 from PeterDaveHello/RemoveTrailingSpaces
Remove trailing spaces in text files
This commit is contained in:
commit
ce182f43db
2
.github/ISSUE_TEMPLATE.md
vendored
2
.github/ISSUE_TEMPLATE.md
vendored
@ -5,7 +5,7 @@
|
|||||||
如何调试 https://github.com/Neilpang/acme.sh/wiki/How-to-debug-acme.sh
|
如何调试 https://github.com/Neilpang/acme.sh/wiki/How-to-debug-acme.sh
|
||||||
|
|
||||||
If it is a bug report:
|
If it is a bug report:
|
||||||
- make sure you are able to repro it on the latest released version.
|
- make sure you are able to repro it on the latest released version.
|
||||||
You can install the latest version by: `acme.sh --upgrade`
|
You can install the latest version by: `acme.sh --upgrade`
|
||||||
|
|
||||||
- Search the existing issues.
|
- Search the existing issues.
|
||||||
|
@ -34,5 +34,5 @@ script:
|
|||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
|
|
||||||
|
|
||||||
|
4
acme.sh
4
acme.sh
@ -178,7 +178,7 @@ _printargs() {
|
|||||||
printf -- "%s" "$1='$2'"
|
printf -- "%s" "$1='$2'"
|
||||||
fi
|
fi
|
||||||
printf "\n"
|
printf "\n"
|
||||||
# return the saved exit status
|
# return the saved exit status
|
||||||
return "$_exitstatus"
|
return "$_exitstatus"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6215,7 +6215,7 @@ Parameters:
|
|||||||
--branch, -b Only valid for '--upgrade' command, specifies the branch name to upgrade to.
|
--branch, -b Only valid for '--upgrade' command, specifies the branch name to upgrade to.
|
||||||
|
|
||||||
--notify-level 0|1|2|3 Set the notification level: Default value is $NOTIFY_LEVEL_DEFAULT.
|
--notify-level 0|1|2|3 Set the notification level: Default value is $NOTIFY_LEVEL_DEFAULT.
|
||||||
0: disabled, no notification will be sent.
|
0: disabled, no notification will be sent.
|
||||||
1: send notifications only when there is an error.
|
1: send notifications only when there is an error.
|
||||||
2: send notifications when a cert is successfully renewed, or there is an error.
|
2: send notifications when a cert is successfully renewed, or there is an error.
|
||||||
3: send notifications when a cert is skipped, renewed, or error.
|
3: send notifications when a cert is skipped, renewed, or error.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
# Script to create certificate to qiniu.com
|
# Script to create certificate to qiniu.com
|
||||||
#
|
#
|
||||||
# This deployment required following variables
|
# This deployment required following variables
|
||||||
# export QINIU_AK="QINIUACCESSKEY"
|
# export QINIU_AK="QINIUACCESSKEY"
|
||||||
|
@ -85,7 +85,7 @@ routeros_deploy() {
|
|||||||
scp "$_ckey" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.key"
|
scp "$_ckey" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.key"
|
||||||
_info "Trying to push cert '$_cfullchain' to router"
|
_info "Trying to push cert '$_cfullchain' to router"
|
||||||
scp "$_cfullchain" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.cer"
|
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
|
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
|
source=\"## generated by routeros deploy script in acme.sh
|
||||||
\n/certificate remove [ find name=$_cdomain.cer_0 ]
|
\n/certificate remove [ find name=$_cdomain.cer_0 ]
|
||||||
\n/certificate remove [ find name=$_cdomain.cer_1 ]
|
\n/certificate remove [ find name=$_cdomain.cer_1 ]
|
||||||
|
@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
# Here is a script to deploy cert to hashicorp vault
|
# Here is a script to deploy cert to hashicorp vault
|
||||||
# (https://www.vaultproject.io/)
|
# (https://www.vaultproject.io/)
|
||||||
#
|
#
|
||||||
# it requires the vault binary to be available in PATH, and the following
|
# it requires the vault binary to be available in PATH, and the following
|
||||||
# environment variables:
|
# environment variables:
|
||||||
#
|
#
|
||||||
# VAULT_PREFIX - this contains the prefix path in vault
|
# VAULT_PREFIX - this contains the prefix path in vault
|
||||||
# VAULT_ADDR - vault requires this to find your vault server
|
# VAULT_ADDR - vault requires this to find your vault server
|
||||||
#
|
#
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
#
|
#
|
||||||
# User must provide login data and URL to DirectAdmin incl. port.
|
# User must provide login data and URL to DirectAdmin incl. port.
|
||||||
# You can create login key, by using the Login Keys function
|
# You can create login key, by using the Login Keys function
|
||||||
# ( https://da.example.com:8443/CMD_LOGIN_KEYS ), which only has access to
|
# ( https://da.example.com:8443/CMD_LOGIN_KEYS ), which only has access to
|
||||||
# - CMD_API_DNS_CONTROL
|
# - CMD_API_DNS_CONTROL
|
||||||
# - CMD_API_SHOW_DOMAINS
|
# - CMD_API_SHOW_DOMAINS
|
||||||
#
|
#
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
# Official Let's Encrypt API for do.de / Domain-Offensive
|
# Official Let's Encrypt API for do.de / Domain-Offensive
|
||||||
#
|
#
|
||||||
# This is different from the dns_do adapter, because dns_do is only usable for enterprise customers
|
# This is different from the dns_do adapter, because dns_do is only usable for enterprise customers
|
||||||
# This API is also available to private customers/individuals
|
# This API is also available to private customers/individuals
|
||||||
#
|
#
|
||||||
# Provide the required LetsEncrypt token like this:
|
# Provide the required LetsEncrypt token like this:
|
||||||
# DO_LETOKEN="FmD408PdqT1E269gUK57"
|
# DO_LETOKEN="FmD408PdqT1E269gUK57"
|
||||||
|
|
||||||
DO_API="https://www.do.de/api/letsencrypt"
|
DO_API="https://www.do.de/api/letsencrypt"
|
||||||
|
@ -147,11 +147,11 @@ _dd_soap() {
|
|||||||
|
|
||||||
# build SOAP XML
|
# build SOAP XML
|
||||||
_xml='<?xml version="1.0" encoding="utf-8"?>
|
_xml='<?xml version="1.0" encoding="utf-8"?>
|
||||||
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
|
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
|
||||||
xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
|
xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
|
||||||
xmlns:tns="urn:'$_urn'"
|
xmlns:tns="urn:'$_urn'"
|
||||||
xmlns:types="urn:'$_urn'/encodedTypes"
|
xmlns:types="urn:'$_urn'/encodedTypes"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||||
<soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">'"$body"'</soap:Body>
|
<soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">'"$body"'</soap:Body>
|
||||||
</soap:Envelope>'
|
</soap:Envelope>'
|
||||||
|
@ -127,7 +127,7 @@ dns_euserv_rm() {
|
|||||||
else
|
else
|
||||||
# find XML block where txtvalue is in. The record_id is allways prior this line!
|
# find XML block where txtvalue is in. The record_id is allways prior this line!
|
||||||
_endLine=$(echo "$response" | grep -n '>dns_record_content<.*>'"$txtvalue"'<' | cut -d ':' -f 1)
|
_endLine=$(echo "$response" | grep -n '>dns_record_content<.*>'"$txtvalue"'<' | cut -d ':' -f 1)
|
||||||
# record_id is the last <name> Tag with a number before the row _endLine, identified by </name><value><struct>
|
# record_id is the last <name> Tag with a number before the row _endLine, identified by </name><value><struct>
|
||||||
_record_id=$(echo "$response" | sed -n '1,'"$_endLine"'p' | grep '</name><value><struct>' | _tail_n 1 | sed 's/.*<name>\([0-9]*\)<\/name>.*/\1/')
|
_record_id=$(echo "$response" | sed -n '1,'"$_endLine"'p' | grep '</name><value><struct>' | _tail_n 1 | sed 's/.*<name>\([0-9]*\)<\/name>.*/\1/')
|
||||||
_info "Deleting record"
|
_info "Deleting record"
|
||||||
_euserv_delete_record "$_record_id"
|
_euserv_delete_record "$_record_id"
|
||||||
|
@ -359,7 +359,7 @@ _freedns_data_id() {
|
|||||||
# before each table row <tr>
|
# before each table row <tr>
|
||||||
# search for the record type withing each row (e.g. TXT)
|
# search for the record type withing each row (e.g. TXT)
|
||||||
# search for the domain within each row (which is within a <a..>
|
# search for the domain within each row (which is within a <a..>
|
||||||
# </a> anchor. And finally extract the domain ID.
|
# </a> anchor. And finally extract the domain ID.
|
||||||
if [ -n "$data_id" ]; then
|
if [ -n "$data_id" ]; then
|
||||||
printf "%s" "$data_id"
|
printf "%s" "$data_id"
|
||||||
return 0
|
return 0
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# bug reports to dev@1e.ca
|
# bug reports to dev@1e.ca
|
||||||
|
|
||||||
# ME_Key=qmlkdjflmkqdjf
|
# ME_Key=qmlkdjflmkqdjf
|
||||||
# ME_Secret=qmsdlkqmlksdvnnpae
|
# ME_Secret=qmsdlkqmlksdvnnpae
|
||||||
|
|
||||||
ME_Api=https://api.dnsmadeeasy.com/V2.0/dns/managed
|
ME_Api=https://api.dnsmadeeasy.com/V2.0/dns/managed
|
||||||
|
@ -3,10 +3,10 @@
|
|||||||
# Namecheap API
|
# Namecheap API
|
||||||
# https://www.namecheap.com/support/api/intro.aspx
|
# https://www.namecheap.com/support/api/intro.aspx
|
||||||
#
|
#
|
||||||
# Requires Namecheap API key set in
|
# Requires Namecheap API key set in
|
||||||
#NAMECHEAP_API_KEY,
|
#NAMECHEAP_API_KEY,
|
||||||
#NAMECHEAP_USERNAME,
|
#NAMECHEAP_USERNAME,
|
||||||
#NAMECHEAP_SOURCEIP
|
#NAMECHEAP_SOURCEIP
|
||||||
# Due to Namecheap's API limitation all the records of your domain will be read and re applied, make sure to have a backup of your records you could apply if any issue would arise.
|
# Due to Namecheap's API limitation all the records of your domain will be read and re applied, make sure to have a backup of your records you could apply if any issue would arise.
|
||||||
|
|
||||||
######## Public functions #####################
|
######## Public functions #####################
|
||||||
|
@ -27,7 +27,7 @@ dns_nsupdate_add() {
|
|||||||
[ -n "$DEBUG" ] && [ "$DEBUG" -ge "$DEBUG_LEVEL_2" ] && nsdebug="-D"
|
[ -n "$DEBUG" ] && [ "$DEBUG" -ge "$DEBUG_LEVEL_2" ] && nsdebug="-D"
|
||||||
if [ -z "${NSUPDATE_ZONE}" ]; then
|
if [ -z "${NSUPDATE_ZONE}" ]; then
|
||||||
nsupdate -k "${NSUPDATE_KEY}" $nsdebug <<EOF
|
nsupdate -k "${NSUPDATE_KEY}" $nsdebug <<EOF
|
||||||
server ${NSUPDATE_SERVER} ${NSUPDATE_SERVER_PORT}
|
server ${NSUPDATE_SERVER} ${NSUPDATE_SERVER_PORT}
|
||||||
update add ${fulldomain}. 60 in txt "${txtvalue}"
|
update add ${fulldomain}. 60 in txt "${txtvalue}"
|
||||||
send
|
send
|
||||||
EOF
|
EOF
|
||||||
@ -64,7 +64,7 @@ dns_nsupdate_rm() {
|
|||||||
[ -n "$DEBUG" ] && [ "$DEBUG" -ge "$DEBUG_LEVEL_2" ] && nsdebug="-D"
|
[ -n "$DEBUG" ] && [ "$DEBUG" -ge "$DEBUG_LEVEL_2" ] && nsdebug="-D"
|
||||||
if [ -z "${NSUPDATE_ZONE}" ]; then
|
if [ -z "${NSUPDATE_ZONE}" ]; then
|
||||||
nsupdate -k "${NSUPDATE_KEY}" $nsdebug <<EOF
|
nsupdate -k "${NSUPDATE_KEY}" $nsdebug <<EOF
|
||||||
server ${NSUPDATE_SERVER} ${NSUPDATE_SERVER_PORT}
|
server ${NSUPDATE_SERVER} ${NSUPDATE_SERVER_PORT}
|
||||||
update delete ${fulldomain}. txt
|
update delete ${fulldomain}. txt
|
||||||
send
|
send
|
||||||
EOF
|
EOF
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#Rcode0 API Integration
|
#Rcode0 API Integration
|
||||||
#https://my.rcodezero.at/api-doc
|
#https://my.rcodezero.at/api-doc
|
||||||
#
|
#
|
||||||
# log into https://my.rcodezero.at/enableapi and get your ACME API Token (the ACME API token has limited
|
# log into https://my.rcodezero.at/enableapi and get your ACME API Token (the ACME API token has limited
|
||||||
# access to the REST calls needed for acme.sh only)
|
# access to the REST calls needed for acme.sh only)
|
||||||
#
|
#
|
||||||
#RCODE0_URL="https://my.rcodezero.at"
|
#RCODE0_URL="https://my.rcodezero.at"
|
||||||
|
Loading…
Reference in New Issue
Block a user