Explorar el Código

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

Added nginx proxy worker configuration to template and defaults
pull/916/head
Slavi Pantaleev hace 5 años
committed by GitHub
padre
commit
0f647594ac
No se encontró ninguna clave conocida en la base de datos para esta firma ID de clave GPG: 4AEE18F83AFDEB23
Se han modificado 2 ficheros con 8 adiciones y 3 borrados
  1. +6
    -0
      roles/matrix-nginx-proxy/defaults/main.yml
  2. +2
    -3
      roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2

+ 6
- 0
roles/matrix-nginx-proxy/defaults/main.yml Ver fichero

@@ -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

+ 2
- 3
roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 Ver fichero

@@ -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 }};
} }






Cargando…
Cancelar
Guardar