Merge pull request #4130 from dokku/3932-clear-proxy-on-boot

Clear proxy configs on boot
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2020-09-10 12:24:27 -04:00
commit 196b5d08eb
2 files changed
+7

No files matched your search

+1
View File
@@ -162,4 +162,5 @@ nginx_clear_config() {
declare desc="Remove the nginx conf file" declare desc="Remove the nginx conf file"
declare APP="$1" declare APP="$1"
rm -f "$DOKKU_ROOT/$APP/nginx.conf" rm -f "$DOKKU_ROOT/$APP/nginx.conf"
fn-nginx-vhosts-nginx-init-cmd "reload"
} }
+6
View File
@@ -17,6 +17,8 @@ cmd-ps-restore() {
plugn trigger pre-restore "$DOKKU_SCHEDULER" "$APP" plugn trigger pre-restore "$DOKKU_SCHEDULER" "$APP"
if [[ -n "$APP" ]]; then if [[ -n "$APP" ]]; then
plugn trigger proxy-clear-config "$APP"
if ! (is_deployed "$APP"); then if ! (is_deployed "$APP"); then
dokku_log_warn "App $APP has not been deployed" dokku_log_warn "App $APP has not been deployed"
return return
@@ -27,6 +29,10 @@ cmd-ps-restore() {
ps_restore "$APP" || dokku_log_warn "dokku ps:restore ${APP} failed" ps_restore "$APP" || dokku_log_warn "dokku ps:restore ${APP} failed"
fi fi
else else
for APP in $(dokku_apps); do
plugn trigger proxy-clear-config "$APP"
done
fn-ps-parallel-cmd "restore" fn-ps-parallel-cmd "restore"
fi fi
} }