Skip to content

Commit a3d0814

Browse files
committed
update http2 syntax
1 parent 5226d05 commit a3d0814

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

docker/default.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
server {
22
listen 80 default_server;
33
listen [::]:80 default_server;
4+
http2 on;
45

56
root /usr/share/nginx/html;
67

@@ -16,4 +17,4 @@ server {
1617
add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
1718
expires off;
1819
}
19-
}
20+
}

docker/init_cert.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ EOF
3030
elif [[ -n "${NGINX_SSL_CERT}" && -n "${NGINX_SSL_KEY}" ]]; then
3131
echo "Configuring the provided SSL certificate at ${NGINX_SSL_CERT}"
3232
remove_ssl_config
33-
sed -i -E "s|listen [0-9]{1,5} (default_server\|ssl http2);|listen ${NGINX_SSL_PORT} ssl http2;|" "${NGINX_CONF}"
34-
sed -i -E "s|listen \[::\]:[0-9]{1,5} (default_server\|ssl http2);|listen \[::\]:${NGINX_SSL_PORT} ssl http2;\n\n ssl_certificate ${NGINX_SSL_CERT};\n ssl_certificate_key ${NGINX_SSL_KEY};|" "${NGINX_CONF}"
33+
sed -i -E "s|listen [0-9]{1,5} (default_server\|ssl);|listen ${NGINX_SSL_PORT} ssl;|" "${NGINX_CONF}"
34+
sed -i -E "s|listen \[::\]:[0-9]{1,5} (default_server\|ssl);|listen \[::\]:${NGINX_SSL_PORT} ssl;\n\n ssl_certificate ${NGINX_SSL_CERT};\n ssl_certificate_key ${NGINX_SSL_KEY};|" "${NGINX_CONF}"
3535
# If the nginx port is provided but no other settings are, update the port
3636
elif [[ "${NGINX_SSL_PORT}" != 443 ]]; then
3737
echo "Setting nginx listen port."
3838
remove_ssl_config
39-
sed -i -E "s|listen [0-9]{1,5} (default_server\|ssl http2);|listen ${NGINX_SSL_PORT} default_server;|" "${NGINX_CONF}"
40-
sed -i -E "s|listen \[::\]:[0-9]{1,5} (default_server\|ssl http2);|listen \[::\]:${NGINX_SSL_PORT} default_server;|" "${NGINX_CONF}"
39+
sed -i -E "s|listen [0-9]{1,5} (default_server\|ssl);|listen ${NGINX_SSL_PORT} default_server;|" "${NGINX_CONF}"
40+
sed -i -E "s|listen \[::\]:[0-9]{1,5} (default_server\|ssl);|listen \[::\]:${NGINX_SSL_PORT} default_server;|" "${NGINX_CONF}"
4141
else
4242
echo "No certificates or Letsencrypt domain was provided. Exiting."
4343
exit 0

0 commit comments

Comments
 (0)