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

add better logging to nginx migrate and fix indentation

Browse Source
This commit is contained in:
Alexis Tyler
2017-07-03 11:54:28 +09:30
committed by Jose Diaz-Gonzalez
parent d3c9e80fcb
commit dc0404dbf1
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/nginx-vhosts/functions
View File

@@ -354,18 +354,22 @@ nginx_build_config() {
# @TODO: Remove this after a few versions # @TODO: Remove this after a few versions
migrate_nginx_to_proxy() { migrate_nginx_to_proxy() {
declare desc="migrates DOKKU_NGINX_* to DOKKI_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 for app in $(dokku_apps); do
local nginx_port="$(config_get "$app" DOKKU_NGINX_PORT || true)" local nginx_port="$(config_get "$app" DOKKU_NGINX_PORT || true)"
local nginx_ssl_port="$(config_get "$app" DOKKU_NGINX_SSL_PORT || true)" local nginx_ssl_port="$(config_get "$app" DOKKU_NGINX_SSL_PORT || true)"
if [[ -n "$nginx_port" ]]; then if [[ -n "$nginx_port" ]]; then
dokku_log_info1 "Migrating DOKKU_NGINX_PORT to DOKKU_PROXY_PORT for $app" dokku_log_info1 "Migrating DOKKU_NGINX_PORT to DOKKU_PROXY_PORT for $app"
config_set --no-restart "$app" DOKKU_PROXY_PORT="$nginx_port" config_set --no-restart "$app" DOKKU_PROXY_PORT="$nginx_port"
config_unset --no-restart "$app" DOKKU_NGINX_PORT config_unset --no-restart "$app" DOKKU_NGINX_PORT
fi fi
if [[ -n "$nginx_ssl_port" ]]; then if [[ -n "$nginx_ssl_port" ]]; then
dokku_log_info1 "Migrating DOKKU_NGINX_SSL_PORT to DOKKU_PROXY_SSL_PORT for $app" 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_set --no-restart "$app" DOKKU_PROXY_SSL_PORT="$nginx_ssl_port"
config_unset --no-restart "$app" DOKKU_NGINX_SSL_PORT config_unset --no-restart "$app" DOKKU_NGINX_SSL_PORT
fi fi
done done
dokku_log_info2 "Migration complete"
} }