Support nginx 1.9.5+
Newer versions of nginx drop spdy support in favor of http2, and thus the nginx config that we bundle with dokku causes nginx to fail to reload in certain cases. This change drops spdy support in favor of http2 for versions of nginx greater than 1.9.5. Closes #2216
This commit is contained in:
1 parent
b71c5b668f
commit
a43fc39d9a
2 files changed
+35
-3
No files matched your search
@@ -120,6 +120,33 @@ get_custom_nginx_template() {
|
|||||||
copy_from_image "$IMAGE" "$NGINX_TEMPLATE_NAME" "$DESTINATION" 2>/dev/null || true
|
copy_from_image "$IMAGE" "$NGINX_TEMPLATE_NAME" "$DESTINATION" 2>/dev/null || true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is_spdy_enabled() {
|
||||||
|
declare desc="detects whether the installed nginx version has spdy or http2 support"
|
||||||
|
local NGINX_VERSION="$1"
|
||||||
|
local MAJOR_VERSION MINOR_VERSION PATCH_VERSION
|
||||||
|
local HAS_SUPPORT=true
|
||||||
|
|
||||||
|
if ! which nginx > /dev/null 2>&1; then
|
||||||
|
echo $HAS_SUPPORT
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
MAJOR_VERSION=$(echo "$NGINX_VERSION" | awk '{split($0,a,"."); print a[1]}')
|
||||||
|
MINOR_VERSION=$(echo "$NGINX_VERSION" | awk '{split($0,a,"."); print a[2]}')
|
||||||
|
PATCH_VERSION=$(echo "$NGINX_VERSION" | awk '{split($0,a,"."); print a[3]}')
|
||||||
|
if [[ "$MAJOR_VERSION" -ge "2" ]]; then
|
||||||
|
HAS_SUPPORT=false
|
||||||
|
elif [[ "$MAJOR_VERSION" -eq "1" ]]; then
|
||||||
|
if [[ "$MINOR_VERSION" -ge "10" ]]; then
|
||||||
|
HAS_SUPPORT=false
|
||||||
|
elif [[ "$MINOR_VERSION" -ge "9" ]] && [[ "$PATCH_VERSION" -ge "5" ]]; then
|
||||||
|
HAS_SUPPORT=false
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo $HAS_SUPPORT
|
||||||
|
}
|
||||||
|
|
||||||
nginx_build_config() {
|
nginx_build_config() {
|
||||||
declare desc="build nginx config to proxy app containers using sigil"
|
declare desc="build nginx config to proxy app containers using sigil"
|
||||||
local APP="$1"; verify_app_name "$APP"
|
local APP="$1"; verify_app_name "$APP"
|
||||||
@@ -188,11 +215,16 @@ nginx_build_config() {
|
|||||||
fi
|
fi
|
||||||
local SSL_SERVER_NAME=$(echo "$SSL_VHOSTS" | xargs)
|
local SSL_SERVER_NAME=$(echo "$SSL_VHOSTS" | xargs)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
local NGINX_VERSION="$(nginx -v 2>&1 | cut -d'/' -f 2)"
|
||||||
|
local SPDY_SUPPORTED="$(is_spdy_enabled "$NGINX_VERSION")"
|
||||||
|
|
||||||
eval "$(config_export app "$APP")"
|
eval "$(config_export app "$APP")"
|
||||||
local SIGIL_PARAMS=(-f $NGINX_TEMPLATE APP="$APP" DOKKU_ROOT="$DOKKU_ROOT"
|
local SIGIL_PARAMS=(-f $NGINX_TEMPLATE APP="$APP" DOKKU_ROOT="$DOKKU_ROOT"
|
||||||
NOSSL_SERVER_NAME="$NOSSL_SERVER_NAME"
|
NOSSL_SERVER_NAME="$NOSSL_SERVER_NAME"
|
||||||
DOKKU_APP_LISTENERS="$DOKKU_APP_LISTENERS"
|
DOKKU_APP_LISTENERS="$DOKKU_APP_LISTENERS"
|
||||||
PASSED_LISTEN_IP_PORT="$PASSED_LISTEN_IP_PORT"
|
PASSED_LISTEN_IP_PORT="$PASSED_LISTEN_IP_PORT"
|
||||||
|
SPDY_SUPPORTED="$SPDY_SUPPORTED"
|
||||||
DOKKU_APP_LISTEN_PORT="$DOKKU_APP_LISTEN_PORT" DOKKU_APP_LISTEN_IP="$DOKKU_APP_LISTEN_IP"
|
DOKKU_APP_LISTEN_PORT="$DOKKU_APP_LISTEN_PORT" DOKKU_APP_LISTEN_IP="$DOKKU_APP_LISTEN_IP"
|
||||||
APP_SSL_PATH="$APP_SSL_PATH" SSL_INUSE="$SSL_INUSE" SSL_SERVER_NAME="$SSL_SERVER_NAME"
|
APP_SSL_PATH="$APP_SSL_PATH" SSL_INUSE="$SSL_INUSE" SSL_SERVER_NAME="$SSL_SERVER_NAME"
|
||||||
NGINX_PORT="$NGINX_PORT" NGINX_SSL_PORT="$NGINX_SSL_PORT" RAW_TCP_PORTS="$RAW_TCP_PORTS")
|
NGINX_PORT="$NGINX_PORT" NGINX_SSL_PORT="$NGINX_SSL_PORT" RAW_TCP_PORTS="$RAW_TCP_PORTS")
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
server {
|
server {
|
||||||
listen [::]:{{ .NGINX_SSL_PORT }} ssl spdy;
|
listen [::]:{{ .NGINX_SSL_PORT }} ssl {{ if eq .SPDY_SUPPORTED "true" }}spdy{{ else }}http2{{ end }};
|
||||||
listen {{ .NGINX_SSL_PORT }} ssl spdy;
|
listen {{ .NGINX_SSL_PORT }} ssl {{ if eq .SPDY_SUPPORTED "true" }}spdy{{ else }}http2{{ end }};
|
||||||
{{ if .SSL_SERVER_NAME }}server_name {{ .SSL_SERVER_NAME }}; {{ end }}
|
{{ if .SSL_SERVER_NAME }}server_name {{ .SSL_SERVER_NAME }}; {{ end }}
|
||||||
{{ if .NOSSL_SERVER_NAME }}server_name {{ .NOSSL_SERVER_NAME }}; {{ end }}
|
{{ if .NOSSL_SERVER_NAME }}server_name {{ .NOSSL_SERVER_NAME }}; {{ end }}
|
||||||
{{ include "log.config" . }}
|
{{ include "log.config" . }}
|
||||||
@@ -8,6 +8,6 @@ server {
|
|||||||
ssl_certificate_key {{ .APP_SSL_PATH }}/server.key;
|
ssl_certificate_key {{ .APP_SSL_PATH }}/server.key;
|
||||||
|
|
||||||
keepalive_timeout 70;
|
keepalive_timeout 70;
|
||||||
add_header Alternate-Protocol {{ .NGINX_SSL_PORT }}:npn-spdy/2;
|
{{ if eq .SPDY_SUPPORTED "true" }}add_header Alternate-Protocol {{ .NGINX_SSL_PORT }}:npn-spdy/2;{{ end }}
|
||||||
{{ include "location.config" . }}
|
{{ include "location.config" . }}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user