plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-22 13:11:41 +00:00
Code Issues Projects Releases Wiki Activity

Use deployconf properly

Browse Source
This commit is contained in:
Brian Hartvigsen 2020-02-09 03:10:11 -08:00
parent 5d3bc95ac5
commit 1259341095
No known key found for this signature in database
GPG Key ID: 46EEA32081255BEB
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deploy/synology_dsm.sh
View File

@ -35,9 +35,9 @@ synology_dsm_deploy() {
_debug _cdomain "$_cdomain" _debug _cdomain "$_cdomain"
# Get Username and Password, but don't save until we successfully authenticate # Get Username and Password, but don't save until we successfully authenticate
SYNO_Username="${SYNO_Username:-$(_getdeployconf SYNO_Username)}" _getdeployconf SYNO_Username
SYNO_Password="${SYNO_Password:-$(_getdeployconf SYNO_Password)}" _getdeployconf SYNO_Password
SYNO_Create="${SYNO_Create:-$(_getdeployconf SYNO_Create)}" _getdeployconf SYNO_Create
if [ -z "$SYNO_Username" ] || [ -z "$SYNO_Password" ]; then if [ -z "$SYNO_Username" ] || [ -z "$SYNO_Password" ]; then
SYNO_Username="" SYNO_Username=""
SYNO_Password="" SYNO_Password=""
@ -48,12 +48,9 @@ synology_dsm_deploy() {
_secure_debug2 SYNO_Password "$SYNO_Password" _secure_debug2 SYNO_Password "$SYNO_Password"
# Optional scheme, hostname, and port for Synology DSM # Optional scheme, hostname, and port for Synology DSM
SYNO_Scheme="${SYNO_Scheme:-$(_getdeployconf SYNO_Scheme)}" _getdeployconf SYNO_Scheme
SYNO_Hostname="${SYNO_Hostname:-$(_getdeployconf SYNO_Hostname)}" _getdeployconf SYNO_Hostname
SYNO_Port="${SYNO_Port:-$(_getdeployconf SYNO_Port)}" _getdeployconf SYNO_Port
_savedeployconf SYNO_Scheme "$SYNO_Scheme"
_savedeployconf SYNO_Hostname "$SYNO_Hostname"
_savedeployconf SYNO_Port "$SYNO_Port"
# default vaules for scheme, hostname, and port # default vaules for scheme, hostname, and port
# defaulting to localhost and http because it's localhost... # defaulting to localhost and http because it's localhost...
@ -61,6 +58,10 @@ synology_dsm_deploy() {
[ -n "${SYNO_Hostname}" ] || SYNO_Hostname="localhost" [ -n "${SYNO_Hostname}" ] || SYNO_Hostname="localhost"
[ -n "${SYNO_Port}" ] || SYNO_Port="5000" [ -n "${SYNO_Port}" ] || SYNO_Port="5000"
_savedeployconf SYNO_Scheme "$SYNO_Scheme"
_savedeployconf SYNO_Hostname "$SYNO_Hostname"
_savedeployconf SYNO_Port "$SYNO_Port"
_debug2 SYNO_Scheme "$SYNO_Scheme" _debug2 SYNO_Scheme "$SYNO_Scheme"
_debug2 SYNO_Hostname "$SYNO_Hostname" _debug2 SYNO_Hostname "$SYNO_Hostname"
_debug2 SYNO_Port "$SYNO_Port" _debug2 SYNO_Port "$SYNO_Port"
@ -107,6 +108,7 @@ synology_dsm_deploy() {
id=$(echo "$response" | sed -n "s/.*\"desc\":\"$SYNO_Certificate\",\"id\":\"\([^\"]*\).*/\1/p") id=$(echo "$response" | sed -n "s/.*\"desc\":\"$SYNO_Certificate\",\"id\":\"\([^\"]*\).*/\1/p")
_debug2 id "$id" _debug2 id "$id"
# shellcheck disable=SC2154
if [ -z "$id" ] && [ -z "$SYNO_Create" ]; then if [ -z "$id" ] && [ -z "$SYNO_Create" ]; then
_err "Unable to find certificate: $SYNO_Certificate and \$SYNO_Create is not set" _err "Unable to find certificate: $SYNO_Certificate and \$SYNO_Create is not set"
return 1 return 1