inline nginx migrate function
This commit is contained in:
1 parent
dc0404dbf1
commit
71bc198cec
2 files changed
+19
-25
No files matched your search
@@ -350,26 +350,3 @@ nginx_build_config() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# @TODO: Remove this after a few versions
|
|
||||||
migrate_nginx_to_proxy() {
|
|
||||||
declare desc="migrates DOKKU_NGINX_* to DOKKI_PROXY_*"
|
|
||||||
dokku_log_info1 "Migrating DOKKU_NGINX env variables. The following variables will be migrated"
|
|
||||||
dokku_log_info2 "DOKKU_NGINX_PORT -> DOKKU_PROXY_PORT"
|
|
||||||
dokku_log_info2 "DOKKU_NGINX_SSL_PORT -> DOKKU_PROXY_SSL_PORT"
|
|
||||||
for app in $(dokku_apps); do
|
|
||||||
local nginx_port="$(config_get "$app" DOKKU_NGINX_PORT || true)"
|
|
||||||
local nginx_ssl_port="$(config_get "$app" DOKKU_NGINX_SSL_PORT || true)"
|
|
||||||
if [[ -n "$nginx_port" ]]; then
|
|
||||||
dokku_log_info1 "Migrating DOKKU_NGINX_PORT to DOKKU_PROXY_PORT for $app"
|
|
||||||
config_set --no-restart "$app" DOKKU_PROXY_PORT="$nginx_port"
|
|
||||||
config_unset --no-restart "$app" DOKKU_NGINX_PORT
|
|
||||||
fi
|
|
||||||
if [[ -n "$nginx_ssl_port" ]]; then
|
|
||||||
dokku_log_info1 "Migrating DOKKU_NGINX_SSL_PORT to DOKKU_PROXY_SSL_PORT for $app"
|
|
||||||
config_set --no-restart "$app" DOKKU_PROXY_SSL_PORT="$nginx_ssl_port"
|
|
||||||
config_unset --no-restart "$app" DOKKU_NGINX_SSL_PORT
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
dokku_log_info2 "Migration complete"
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
|
|
||||||
|
|
||||||
case "$DOKKU_DISTRO" in
|
case "$DOKKU_DISTRO" in
|
||||||
debian)
|
debian)
|
||||||
@@ -74,7 +73,25 @@ cp "${PLUGIN_CORE_AVAILABLE_PATH}/nginx-vhosts/templates/500-error.html" "${DOKK
|
|||||||
# patch broken nginx 1.8.0 logrotate
|
# patch broken nginx 1.8.0 logrotate
|
||||||
[[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/invoke-rc.d/service/g' /etc/logrotate.d/nginx
|
[[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/invoke-rc.d/service/g' /etc/logrotate.d/nginx
|
||||||
|
|
||||||
migrate_nginx_to_proxy
|
# @TODO: Remove this after a few versions
|
||||||
|
dokku_log_info1 "Migrating DOKKU_NGINX env variables. The following variables will be migrated"
|
||||||
|
dokku_log_info2 "DOKKU_NGINX_PORT -> DOKKU_PROXY_PORT"
|
||||||
|
dokku_log_info2 "DOKKU_NGINX_SSL_PORT -> DOKKU_PROXY_SSL_PORT"
|
||||||
|
for app in $(dokku_apps); do
|
||||||
|
local nginx_port="$(config_get "$app" DOKKU_NGINX_PORT || true)"
|
||||||
|
local nginx_ssl_port="$(config_get "$app" DOKKU_NGINX_SSL_PORT || true)"
|
||||||
|
if [[ -n "$nginx_port" ]]; then
|
||||||
|
dokku_log_info1 "Migrating DOKKU_NGINX_PORT to DOKKU_PROXY_PORT for $app"
|
||||||
|
config_set --no-restart "$app" DOKKU_PROXY_PORT="$nginx_port"
|
||||||
|
config_unset --no-restart "$app" DOKKU_NGINX_PORT
|
||||||
|
fi
|
||||||
|
if [[ -n "$nginx_ssl_port" ]]; then
|
||||||
|
dokku_log_info1 "Migrating DOKKU_NGINX_SSL_PORT to DOKKU_PROXY_SSL_PORT for $app"
|
||||||
|
config_set --no-restart "$app" DOKKU_PROXY_SSL_PORT="$nginx_ssl_port"
|
||||||
|
config_unset --no-restart "$app" DOKKU_NGINX_SSL_PORT
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
dokku_log_info2 "Migration complete"
|
||||||
|
|
||||||
case "$DOKKU_DISTRO" in
|
case "$DOKKU_DISTRO" in
|
||||||
debian)
|
debian)
|
||||||
|
|||||||
Reference in new issue
Block a user