github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11597 from overleaf/jpa-server-ce-nginx-keepalive

Browse source 
[server-ce] nginx: make keepalive_timeout configurable

GitOrigin-RevId: 3a0bb049b57f0a4ee065c86463fd6300d97934c7
This commit is contained in:
Jakob Ackermann 2023-02-02 09:42:07 +00:00 committed by Copybot
parent db54475bd0
commit 8d3bc8422e
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server-ce/init_scripts/01_nginx_config_template.sh
View file

@ -17,15 +17,20 @@ nginx_template_file="${nginx_templates_dir}/nginx.conf.template"
nginx_config_file="${nginx_dir}/nginx.conf" nginx_config_file="${nginx_dir}/nginx.conf"
if [ -f "${nginx_template_file}" ]; then if [ -f "${nginx_template_file}" ]; then
export NGINX_WORKER_PROCESSES="${NGINX_WORKER_PROCESSES:-4}" export NGINX_KEEPALIVE_TIMEOUT="${NGINX_KEEPALIVE_TIMEOUT:-65}"
export NGINX_WORKER_CONNECTIONS="${NGINX_WORKER_CONNECTIONS:-768}" export NGINX_WORKER_CONNECTIONS="${NGINX_WORKER_CONNECTIONS:-768}"
export NGINX_WORKER_PROCESSES="${NGINX_WORKER_PROCESSES:-4}"
echo "Nginx: generating config file from template" echo "Nginx: generating config file from template"
# Note the single-quotes, they are important. # Note the single-quotes, they are important.
# This is a pass-list of env-vars that envsubst # This is a pass-list of env-vars that envsubst
# should operate on. # should operate on.
envsubst '${NGINX_WORKER_PROCESSES} ${NGINX_WORKER_CONNECTIONS}' \ envsubst '
${NGINX_KEEPALIVE_TIMEOUT}
${NGINX_WORKER_CONNECTIONS}
${NGINX_WORKER_PROCESSES}
' \
< "${nginx_template_file}" \ < "${nginx_template_file}" \
> "${nginx_config_file}" > "${nginx_config_file}"

2
server-ce/nginx/nginx.conf.template
View file

@ -21,7 +21,7 @@ http {
sendfile on; sendfile on;
tcp_nopush on; tcp_nopush on;
tcp_nodelay on; tcp_nodelay on;
keepalive_timeout 65; keepalive_timeout ${NGINX_KEEPALIVE_TIMEOUT};
types_hash_max_size 2048; types_hash_max_size 2048;
# server_tokens off; # server_tokens off;