Make make test pass on linting

This commit is contained in:
Roland van Laar
2020-07-04 00:08:44 +02:00
parent 6e9f21b1d5
commit 5f312d7347
8 changed files with 11 additions and 12 deletions

View File

@@ -95,7 +95,6 @@ cmd-nginx-show-config() {
cat "$DOKKU_ROOT/$APP/nginx.conf"
}
cmd-nginx-validate-config() {
declare desc="validates and optionally cleans up invalid nginx configurations"
declare cmd="nginx:validate-config"

View File

@@ -453,7 +453,7 @@ nginx_build_config() {
LISTENERS="$(plugn trigger network-get-listeners "$APP" "$PROC_TYPE" | xargs)"
UPP_PROC_TYPE="${PROC_TYPE^^}"
UPP_PROC_TYPE="${UPP_PROC_TYPE//-/_}"
SIGIL_PARAMS+=( "DOKKU_APP_${UPP_PROC_TYPE}_LISTENERS=$LISTENERS" )
SIGIL_PARAMS+=("DOKKU_APP_${UPP_PROC_TYPE}_LISTENERS=$LISTENERS")
done <"$DOKKU_SCALE_FILE"
if grep DOKKU_APP_LISTENERS "$NGINX_TEMPLATE"; then

View File

@@ -11,7 +11,7 @@ trigger-nginx-vhosts-post-app-rename-setup() {
declare OLD_APP="$1" NEW_APP="$2"
fn-plugin-property-clone "nginx" "$OLD_APP" "$NEW_APP"
fn-plugin-property-destroy "nginx" "$OLD_APP"
fn-plugin-property-destroy "nginx" "$OLD_APP"
plugn trigger proxy-clear-config "$NEW_APP"
}