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

Merge pull request #4064 from hugopeixoto/fix/normalize-path-file-variable-names

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-07-16 10:40:08 -04:00
committed by GitHub
parent c66c85429e 2160a8b64e
commit c01767fade
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/domains/functions
View File

@@ -8,13 +8,13 @@ disable_app_vhost() {
declare desc="disable vhost support for given application" declare desc="disable vhost support for given application"
declare APP=$1 RESTART_APP="$2" declare APP=$1 RESTART_APP="$2"
verify_app_name "$APP" verify_app_name "$APP"
local APP_VHOST_FILE="$DOKKU_ROOT/$APP/VHOST" local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
local APP_URLS_FILE="$DOKKU_ROOT/$APP/URLS" local APP_URLS_PATH="$DOKKU_ROOT/$APP/URLS"
plugn trigger pre-disable-vhost "$APP" plugn trigger pre-disable-vhost "$APP"
if [[ -f "$APP_VHOST_FILE" ]] || [[ -f "$APP_URLS_FILE" ]]; then if [[ -f "$APP_VHOST_PATH" ]] || [[ -f "$APP_URLS_PATH" ]]; then
dokku_log_info1 "App virtual host support disabled" dokku_log_info1 "App virtual host support disabled"
rm -f "$APP_VHOST_FILE" "$APP_URLS_FILE" rm -f "$APP_VHOST_PATH" "$APP_URLS_PATH"
fi fi
[[ "$RESTART_APP" == "--no-restart" ]] && local CONFIG_SET_ARGS=$RESTART_APP [[ "$RESTART_APP" == "--no-restart" ]] && local CONFIG_SET_ARGS=$RESTART_APP
@@ -220,13 +220,13 @@ get_app_domains() {
declare desc="return app domains" declare desc="return app domains"
verify_app_name "$1" verify_app_name "$1"
local APP=$1 local APP=$1
local APP_VHOST_FILE="$DOKKU_ROOT/$APP/VHOST" local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST" local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST"
local GLOBAL_HOSTNAME_PATH="$DOKKU_ROOT/HOSTNAME" local GLOBAL_HOSTNAME_PATH="$DOKKU_ROOT/HOSTNAME"
if [[ "$(is_app_vhost_enabled "$APP")" == "true" ]]; then if [[ "$(is_app_vhost_enabled "$APP")" == "true" ]]; then
if [[ -f "$APP_VHOST_FILE" ]]; then if [[ -f "$APP_VHOST_PATH" ]]; then
cat "$APP_VHOST_FILE" cat "$APP_VHOST_PATH"
elif [[ -f "$GLOBAL_VHOST_PATH" ]]; then elif [[ -f "$GLOBAL_VHOST_PATH" ]]; then
cat "$GLOBAL_VHOST_PATH" cat "$GLOBAL_VHOST_PATH"
elif [[ -f "$GLOBAL_HOSTNAME_PATH" ]]; then elif [[ -f "$GLOBAL_HOSTNAME_PATH" ]]; then
@@ -264,8 +264,8 @@ get_default_vhosts() {
get_global_vhosts() { get_global_vhosts() {
declare desc="return global vhosts" declare desc="return global vhosts"
local GLOBAL_VHOST_FILE="$DOKKU_ROOT/VHOST" local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST"
[[ -f "$GLOBAL_VHOST_FILE" ]] && local GLOBAL_VHOSTS=$(<"$GLOBAL_VHOST_FILE") [[ -f "$GLOBAL_VHOST_PATH" ]] && local GLOBAL_VHOSTS=$(<"$GLOBAL_VHOST_PATH")
echo "$GLOBAL_VHOSTS" echo "$GLOBAL_VHOSTS"
} }

6
plugins/domains/internal-functions
View File

@@ -96,9 +96,9 @@ fn-domains-app-enabled() {
fn-domains-app-vhosts() { fn-domains-app-vhosts() {
declare APP="$1" declare APP="$1"
local APP_VHOST_FILE="$DOKKU_ROOT/$APP/VHOST" local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
if [[ -f "$APP_VHOST_FILE" ]]; then if [[ -f "$APP_VHOST_PATH" ]]; then
tr '\n' ' ' <"$APP_VHOST_FILE" tr '\n' ' ' <"$APP_VHOST_PATH"
fi fi
} }

6
plugins/nginx-vhosts/functions
View File

@@ -315,7 +315,7 @@ nginx_build_config() {
local DOKKU_APP_LISTEN_PORT="$2" local DOKKU_APP_LISTEN_PORT="$2"
local DOKKU_APP_LISTEN_IP="$3" local DOKKU_APP_LISTEN_IP="$3"
local VHOST_PATH="$DOKKU_ROOT/$APP/VHOST" local VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
local URLS_PATH="$DOKKU_ROOT/$APP/URLS" local APP_URLS_PATH="$DOKKU_ROOT/$APP/URLS"
local NGINX_TEMPLATE_NAME="nginx.conf.sigil" local NGINX_TEMPLATE_NAME="nginx.conf.sigil"
local DEFAULT_NGINX_TEMPLATE="$PLUGIN_AVAILABLE_PATH/nginx-vhosts/templates/$NGINX_TEMPLATE_NAME" local DEFAULT_NGINX_TEMPLATE="$PLUGIN_AVAILABLE_PATH/nginx-vhosts/templates/$NGINX_TEMPLATE_NAME"
local NGINX_TEMPLATE="$DEFAULT_NGINX_TEMPLATE" local NGINX_TEMPLATE="$DEFAULT_NGINX_TEMPLATE"
@@ -484,8 +484,8 @@ nginx_build_config() {
fi fi
if ([[ -n "$NONSSL_VHOSTS" ]] || [[ -n "$SSL_VHOSTS" ]]) && [[ "$IS_APP_VHOST_ENABLED" == "true" ]]; then if ([[ -n "$NONSSL_VHOSTS" ]] || [[ -n "$SSL_VHOSTS" ]]) && [[ "$IS_APP_VHOST_ENABLED" == "true" ]]; then
echo "# THIS FILE IS GENERATED BY DOKKU - DO NOT EDIT, YOUR CHANGES WILL BE OVERWRITTEN" >"$URLS_PATH" echo "# THIS FILE IS GENERATED BY DOKKU - DO NOT EDIT, YOUR CHANGES WILL BE OVERWRITTEN" >"$APP_URLS_PATH"
xargs -i echo "$SCHEME://{}" <<<"$(echo "${SSL_VHOSTS}" "${NONSSL_VHOSTS}" | tr ' ' '\n' | sort -u)" >>"$URLS_PATH" xargs -i echo "$SCHEME://{}" <<<"$(echo "${SSL_VHOSTS}" "${NONSSL_VHOSTS}" | tr ' ' '\n' | sort -u)" >>"$APP_URLS_PATH"
fi fi
else else
# note because this clause is long. if the proxy is disabled: # note because this clause is long. if the proxy is disabled: