From cfe025396ff7417cf8fd04bd64becc966cf2ac07 Mon Sep 17 00:00:00 2001 From: Marcel Partap Date: Tue, 14 Apr 2020 16:59:43 +0200 Subject: [PATCH 1/4] nginx configuration: use more than one process --- roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 b/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 index 51aa8a006..9ee72c879 100644 --- a/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 +++ b/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 @@ -8,7 +8,7 @@ # - 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 -worker_processes 1; +worker_processes auto; error_log /var/log/nginx/error.log warn; pid /tmp/nginx.pid; From 5af8d4ed2d1e26a63c7896e7b05d645667e21310 Mon Sep 17 00:00:00 2001 From: Marcel Partap Date: Tue, 14 Apr 2020 17:01:59 +0200 Subject: [PATCH 2/4] nginx configuration: enable caching / precompiled regular expressions --- roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 b/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 index 9ee72c879..3db5a40c8 100644 --- a/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 +++ b/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 @@ -18,6 +18,8 @@ events { worker_connections 1024; } +# "PCRE JIT can speed up processing of regular expressions significantly." +pcre_jit on; http { proxy_temp_path /tmp/proxy_temp; From 7067c4119c4dee57f778bedd3aa0c8a44cc86053 Mon Sep 17 00:00:00 2001 From: Marcel Partap Date: Tue, 14 Apr 2020 17:18:39 +0200 Subject: [PATCH 3/4] nginx service: disable unnecessary docker kill/rm calls (got --rm) --- .../templates/systemd/matrix-nginx-proxy.service.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2 b/roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2 index 5b4dfb2af..36309659a 100644 --- a/roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2 +++ b/roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2 @@ -11,8 +11,8 @@ Wants={{ service }} [Service] Type=simple -ExecStartPre=-/usr/bin/docker kill matrix-nginx-proxy -ExecStartPre=-/usr/bin/docker rm matrix-nginx-proxy +#ExecStartPre=-/usr/bin/docker kill matrix-nginx-proxy +#ExecStartPre=-/usr/bin/docker rm matrix-nginx-proxy ExecStart=/usr/bin/docker run --rm --name matrix-nginx-proxy \ --log-driver=none \ @@ -43,8 +43,8 @@ ExecStart=/usr/bin/docker run --rm --name matrix-nginx-proxy \ {% endfor %} {{ matrix_nginx_proxy_docker_image }} -ExecStop=-/usr/bin/docker kill matrix-nginx-proxy -ExecStop=-/usr/bin/docker rm matrix-nginx-proxy +#ExecStop=-/usr/bin/docker kill matrix-nginx-proxy +#ExecStop=-/usr/bin/docker rm matrix-nginx-proxy ExecReload=/usr/bin/docker exec matrix-nginx-proxy /usr/sbin/nginx -s reload Restart=always RestartSec=30 From 19102b71411d6883e35002ebc7c0ff34c13684bb Mon Sep 17 00:00:00 2001 From: Marcel Partap Date: Tue, 14 Apr 2020 17:19:19 +0200 Subject: [PATCH 4/4] nginx service: reduce restart time --- .../templates/systemd/matrix-nginx-proxy.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2 b/roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2 index 36309659a..fa0571efa 100644 --- a/roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2 +++ b/roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2 @@ -47,7 +47,7 @@ ExecStart=/usr/bin/docker run --rm --name matrix-nginx-proxy \ #ExecStop=-/usr/bin/docker rm matrix-nginx-proxy ExecReload=/usr/bin/docker exec matrix-nginx-proxy /usr/sbin/nginx -s reload Restart=always -RestartSec=30 +RestartSec=15 SyslogIdentifier=matrix-nginx-proxy [Install]