plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-25 06:31:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into FreeDNS

Browse Source
This commit is contained in:
David Kerr 2017-02-04 10:51:52 -05:00
commit 09ed421948
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
acme.sh
View File

@ -1820,14 +1820,18 @@ _starttlsserver() {
_readlink() { _readlink() {
_rf="$1" _rf="$1"
if ! readlink -f "$_rf" 2>/dev/null; then if ! readlink -f "$_rf" 2>/dev/null; then
if _startswith "$_rf" "\./$PROJECT_ENTRY"; then if _startswith "$_rf" "/"; then
printf -- "%s" "$(pwd)/$PROJECT_ENTRY" echo "$_rf"
return 0 return 0
fi fi
readlink "$_rf" echo "$(pwd)/$_rf" | _conapath
fi fi
} }
_conapath() {
sed "s#/\./#/#g"
}
__initHome() { __initHome() {
if [ -z "$_SCRIPT_HOME" ]; then if [ -z "$_SCRIPT_HOME" ]; then
if _exists readlink && _exists dirname; then if _exists readlink && _exists dirname; then
@ -4666,7 +4670,7 @@ _process() {
HTTPS_INSECURE="1" HTTPS_INSECURE="1"
;; ;;
--ca-bundle) --ca-bundle)
_ca_bundle="$(readlink -f "$2")" _ca_bundle="$(_readlink -f "$2")"
CA_BUNDLE="$_ca_bundle" CA_BUNDLE="$_ca_bundle"
shift shift
;; ;;

1
deploy/README.md Normal file
View File

@ -0,0 +1 @@
#Using deploy api

2
dnsapi/dns_lua.sh
View File

@ -67,7 +67,7 @@ dns_lua_add() {
_debug "record_id" "$record_id" _debug "record_id" "$record_id"
_LUA_rest PUT "zones/$_domain_id/records/$record_id" "{\"id\":$record_id,\"type\":\"TXT\",\"name\":\"$fulldomain.\",\"content\":\"$txtvalue\",\"zone_id\":$_domain_id,\"ttl\":120}" _LUA_rest PUT "zones/$_domain_id/records/$record_id" "{\"id\":$record_id,\"type\":\"TXT\",\"name\":\"$fulldomain.\",\"content\":\"$txtvalue\",\"zone_id\":$_domain_id,\"ttl\":120}"
if [ "$?" = "0" ] && _contains "$response" "updated_at" ; then if [ "$?" = "0" ] && _contains "$response" "updated_at"; then
_info "Updated!" _info "Updated!"
#todo: check if the record takes effect #todo: check if the record takes effect
return 0 return 0