github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

refactor trigger proxy-build-config from nginx#core-post-deploy

Browse Source 
This reduces the duplicated code in the plugin.
This commit is contained in:
Jose Diaz-Gonzalez
2022-11-27 19:50:57 -05:00
parent 9ccd1f397c
commit 348a593ee8
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/nginx-vhosts/core-post-deploy
View File

@@ -14,20 +14,7 @@ trigger-nginx-vhosts-core-post-deploy() {
return return
fi fi
HAS_NETWORK_CONFIG="$(plugn trigger network-config-exists "$APP")" plugn trigger proxy-build-config "$APP"
if [[ "$HAS_NETWORK_CONFIG" == "true" ]]; then
plugn trigger domains-setup "$APP"
nginx_build_config "$APP"
if [[ -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/app-$APP/nginx.conf.sigil.$DOKKU_PID" ]]; then
mv "${DOKKU_LIB_ROOT}/data/nginx-vhosts/app-$APP/nginx.conf.sigil.$DOKKU_PID" "${DOKKU_LIB_ROOT}/data/nginx-vhosts/app-$APP/nginx.conf.sigil"
fi
if [[ -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/app-$APP/nginx.conf.sigil.$DOKKU_PID.missing" ]]; then
rm -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/app-$APP/nginx.conf.sigil.$DOKKU_PID.missing"
rm -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/app-$APP/nginx.conf.sigil"
fi
else
nginx_clear_config "$APP"
fi
} }
trigger-nginx-vhosts-core-post-deploy "$@" trigger-nginx-vhosts-core-post-deploy "$@"

20
plugins/nginx-vhosts/proxy-build-config
View File

@@ -8,12 +8,28 @@ trigger-nginx-vhosts-proxy-build-config() {
declare desc="build nginx config to proxy app containers from command line" declare desc="build nginx config to proxy app containers from command line"
declare trigger="proxy-build-config" declare trigger="proxy-build-config"
declare APP="$1" declare APP="$1"
local HAS_NETWORK_CONFIG
[[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on" if [[ "$(plugn trigger proxy-type "$APP")" != "nginx" ]]; then
if [[ "$(plugn trigger proxy-type "$APP")" == "nginx" ]]; then return
fi
HAS_NETWORK_CONFIG="$(plugn trigger network-config-exists "$APP")"
if [[ "$HAS_NETWORK_CONFIG" == "true" ]]; then
plugn trigger domains-setup "$APP"
plugn trigger network-build-config "$APP" plugn trigger network-build-config "$APP"
nginx_build_config "$APP" nginx_build_config "$APP"
if [[ -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/app-$APP/nginx.conf.sigil.$DOKKU_PID" ]]; then
mv "${DOKKU_LIB_ROOT}/data/nginx-vhosts/app-$APP/nginx.conf.sigil.$DOKKU_PID" "${DOKKU_LIB_ROOT}/data/nginx-vhosts/app-$APP/nginx.conf.sigil"
fi
if [[ -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/app-$APP/nginx.conf.sigil.$DOKKU_PID.missing" ]]; then
rm -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/app-$APP/nginx.conf.sigil.$DOKKU_PID.missing"
rm -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/app-$APP/nginx.conf.sigil"
fi
else
nginx_clear_config "$APP"
fi fi
} }
trigger-nginx-vhosts-proxy-build-config "$@" trigger-nginx-vhosts-proxy-build-config "$@"