Merge pull request #915 from SierraKiloBravo/add-nginx-worker-config

Added nginx proxy worker configuration to template and defaults
This commit is contained in:
Slavi Pantaleev 2021-03-02 13:04:28 +02:00 committed by GitHub
commit 0f647594ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View file

@ -364,3 +364,9 @@ matrix_nginx_proxy_synapse_generic_worker_federation_locations: []
matrix_nginx_proxy_synapse_media_repository_locations: [] matrix_nginx_proxy_synapse_media_repository_locations: []
matrix_nginx_proxy_synapse_user_dir_locations: [] matrix_nginx_proxy_synapse_user_dir_locations: []
matrix_nginx_proxy_synapse_frontend_proxy_locations: [] matrix_nginx_proxy_synapse_frontend_proxy_locations: []
# The amount of worker processes and connections
# Consider increasing these when you are expecting high amounts of traffic
# http://nginx.org/en/docs/ngx_core_module.html#worker_connections
matrix_nginx_proxy_worker_processes: 1
matrix_nginx_proxy_worker_connections: 1024

View file

@ -8,14 +8,13 @@
# - various temp paths are changed to `/tmp`, so that a non-root user can write to them # - various temp paths are changed to `/tmp`, so that a non-root user can write to them
# - the `user` directive was removed, as we don't want nginx to switch users # - the `user` directive was removed, as we don't want nginx to switch users
worker_processes 1; worker_processes {{ matrix_nginx_proxy_worker_processes }};
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
events { events {
worker_connections 1024; worker_connections {{ matrix_nginx_proxy_worker_connections }};
} }