Merge pull request #7321 from dokku/fix-nginx-commands

Allow nginx commands when the scheduler is set to null
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2024-11-03 00:34:53 -04:00
commit 80cf483ded
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -164,7 +164,7 @@ cmd-nginx-show-config() {
proxy_type="$(plugn trigger proxy-type "$APP")" proxy_type="$(plugn trigger proxy-type "$APP")"
local DOKKU_SCHEDULER=$(get_app_scheduler "$APP") local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then if [[ "$DOKKU_SCHEDULER" != "docker-local" ]] && [[ "$DOKKU_SCHEDULER" != "null" ]]; then
plugn trigger scheduler-proxy-config "$DOKKU_SCHEDULER" "$APP" "$proxy_type" plugn trigger scheduler-proxy-config "$DOKKU_SCHEDULER" "$APP" "$proxy_type"
return $? return $?
fi fi
+1 -1
View File
@@ -86,7 +86,7 @@ nginx_logs() {
fi fi
local DOKKU_SCHEDULER=$(get_app_scheduler "$APP") local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then if [[ "$DOKKU_SCHEDULER" != "docker-local" ]] && [[ "$DOKKU_SCHEDULER" != "null" ]]; then
plugn trigger scheduler-proxy-logs "$DOKKU_SCHEDULER" "$APP" "$proxy_type" "$NGINX_LOGS_TYPE" "$tail" "$num" plugn trigger scheduler-proxy-logs "$DOKKU_SCHEDULER" "$APP" "$proxy_type" "$NGINX_LOGS_TYPE" "$tail" "$num"
return $? return $?
fi fi