Fix bug saving SYNO_LOCAL_HOSTNAME
Exporting SYNO_LOCAL_HOSTNAME=1 only works on the first deploy invocation. Subsequent deploys using the saved config fails because it saves $SYNO_HOSTNAME instead of $SYNO_LOCAL_HOSTNAME.pull/6226/head
parent
f981c782bb
commit
def41a7878
|
@ -186,7 +186,7 @@ synology_dsm_deploy() {
|
||||||
if [ -n "$SYNO_USE_TEMP_ADMIN" ]; then
|
if [ -n "$SYNO_USE_TEMP_ADMIN" ]; then
|
||||||
_getdeployconf SYNO_LOCAL_HOSTNAME
|
_getdeployconf SYNO_LOCAL_HOSTNAME
|
||||||
_debug SYNO_LOCAL_HOSTNAME "${SYNO_LOCAL_HOSTNAME:-}"
|
_debug SYNO_LOCAL_HOSTNAME "${SYNO_LOCAL_HOSTNAME:-}"
|
||||||
if [ "$SYNO_LOCAL_HOSTNAME" != "1" ] && [ "$SYNO_LOCAL_HOSTNAME" == "$SYNO_HOSTNAME" ]; then
|
if [ "$SYNO_LOCAL_HOSTNAME" != "1" ]; then
|
||||||
if [ "$SYNO_HOSTNAME" != "localhost" ] && [ "$SYNO_HOSTNAME" != "127.0.0.1" ]; then
|
if [ "$SYNO_HOSTNAME" != "localhost" ] && [ "$SYNO_HOSTNAME" != "127.0.0.1" ]; then
|
||||||
_err "SYNO_USE_TEMP_ADMIN=1 only support local deployment, though if you are sure that the hostname $SYNO_HOSTNAME is targeting to your **current local machine**, execute 'export SYNO_LOCAL_HOSTNAME=1' then rerun."
|
_err "SYNO_USE_TEMP_ADMIN=1 only support local deployment, though if you are sure that the hostname $SYNO_HOSTNAME is targeting to your **current local machine**, execute 'export SYNO_LOCAL_HOSTNAME=1' then rerun."
|
||||||
return 1
|
return 1
|
||||||
|
@ -320,7 +320,7 @@ synology_dsm_deploy() {
|
||||||
_cleardeployconf SYNO_DEVICE_ID
|
_cleardeployconf SYNO_DEVICE_ID
|
||||||
_cleardeployconf SYNO_DEVICE_NAME
|
_cleardeployconf SYNO_DEVICE_NAME
|
||||||
_savedeployconf SYNO_USE_TEMP_ADMIN "$SYNO_USE_TEMP_ADMIN"
|
_savedeployconf SYNO_USE_TEMP_ADMIN "$SYNO_USE_TEMP_ADMIN"
|
||||||
_savedeployconf SYNO_LOCAL_HOSTNAME "$SYNO_HOSTNAME"
|
_savedeployconf SYNO_LOCAL_HOSTNAME "$SYNO_LOCAL_HOSTNAME"
|
||||||
else
|
else
|
||||||
_savedeployconf SYNO_USERNAME "$SYNO_USERNAME"
|
_savedeployconf SYNO_USERNAME "$SYNO_USERNAME"
|
||||||
_savedeployconf SYNO_PASSWORD "$SYNO_PASSWORD"
|
_savedeployconf SYNO_PASSWORD "$SYNO_PASSWORD"
|
||||||
|
|
Loading…
Reference in New Issue