From 5d2dff8fd27022b6d1319bbe86e8059143bcd5ce Mon Sep 17 00:00:00 2001 From: Bernhard Tittelbach Date: Sun, 7 Jun 2026 20:39:09 +0200 Subject: [PATCH] dokuwiki: update php version, error_log to systemd which has sane space management, increase php workers --- ansible/roles/web/dokuwiki/handlers/main.yml | 2 +- ansible/roles/web/dokuwiki/tasks/main.yml | 2 +- ansible/roles/web/dokuwiki/templates/nginx.j2 | 2 ++ ansible/roles/web/dokuwiki/templates/php-fpm.conf.j2 | 2 +- ansible/roles/web/r3redirects/templates/r3.at.j2 | 3 +++ ansible/roles/web/r3redirects/templates/sensors.realraum.at.j2 | 1 + ansible/roles/web/r3redirects/templates/w.r3.at.j2 | 1 + ansible/roles/web/r3redirects/templates/wiki.realraum.at.j2 | 1 + ansible/roles/web/r3redirects/templates/www.realraum.at.j2 | 2 ++ ansible/roles/web/r3status/templates/nginx.j2 | 3 +++ 10 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ansible/roles/web/dokuwiki/handlers/main.yml b/ansible/roles/web/dokuwiki/handlers/main.yml index feb04f1..4130a67 100644 --- a/ansible/roles/web/dokuwiki/handlers/main.yml +++ b/ansible/roles/web/dokuwiki/handlers/main.yml @@ -2,7 +2,7 @@ ## TODO: fix hardcoded php version... - name: reload php-fpm service: - name: php8.2-fpm.service + name: php8.4-fpm.service state: reloaded - name: reload nginx diff --git a/ansible/roles/web/dokuwiki/tasks/main.yml b/ansible/roles/web/dokuwiki/tasks/main.yml index 6009e49..97da040 100644 --- a/ansible/roles/web/dokuwiki/tasks/main.yml +++ b/ansible/roles/web/dokuwiki/tasks/main.yml @@ -50,7 +50,7 @@ - name: install php-fpm config template: src: php-fpm.conf.j2 - dest: /etc/php/8.2/fpm/pool.d/z_read_last_dokuwiki.conf + dest: /etc/php/8.4/fpm/pool.d/z_read_last_dokuwiki.conf notify: reload php-fpm diff --git a/ansible/roles/web/dokuwiki/templates/nginx.j2 b/ansible/roles/web/dokuwiki/templates/nginx.j2 index 11ac035..8f3ddf6 100644 --- a/ansible/roles/web/dokuwiki/templates/nginx.j2 +++ b/ansible/roles/web/dokuwiki/templates/nginx.j2 @@ -12,6 +12,8 @@ server { include snippets/security-headers.conf; + access_log off; + error_log syslog:server=unix:/dev/log,facility=local1,severity=info; client_max_body_size 4M; client_body_buffer_size 128k; diff --git a/ansible/roles/web/dokuwiki/templates/php-fpm.conf.j2 b/ansible/roles/web/dokuwiki/templates/php-fpm.conf.j2 index e835021..eee5144 100644 --- a/ansible/roles/web/dokuwiki/templates/php-fpm.conf.j2 +++ b/ansible/roles/web/dokuwiki/templates/php-fpm.conf.j2 @@ -8,7 +8,7 @@ listen.owner = www-data listen.group = www-data pm = dynamic -pm.max_children = 5 +pm.max_children = 30 pm.start_servers = 2 pm.min_spare_servers = 1 pm.max_spare_servers = 3 diff --git a/ansible/roles/web/r3redirects/templates/r3.at.j2 b/ansible/roles/web/r3redirects/templates/r3.at.j2 index a65e27e..42f1ebf 100644 --- a/ansible/roles/web/r3redirects/templates/r3.at.j2 +++ b/ansible/roles/web/r3redirects/templates/r3.at.j2 @@ -14,6 +14,9 @@ server { root {{ r3rsrv.rootdir }}; + access_log off; + error_log syslog:server=unix:/dev/log,facility=local1,severity=info; + location = /events.ics { return 302 https://status.realraum.at/ics/grical_realraum.ical; # planned: 301 } diff --git a/ansible/roles/web/r3redirects/templates/sensors.realraum.at.j2 b/ansible/roles/web/r3redirects/templates/sensors.realraum.at.j2 index aaced74..3a2a8d7 100644 --- a/ansible/roles/web/r3redirects/templates/sensors.realraum.at.j2 +++ b/ansible/roles/web/r3redirects/templates/sensors.realraum.at.j2 @@ -15,6 +15,7 @@ server { root {{ r3rsrv.rootdir }}; access_log off; + error_log syslog:server=unix:/dev/log,facility=local1,severity=info; location / { return 307 https://status.realraum.at/; diff --git a/ansible/roles/web/r3redirects/templates/w.r3.at.j2 b/ansible/roles/web/r3redirects/templates/w.r3.at.j2 index 974e7f8..769cd65 100644 --- a/ansible/roles/web/r3redirects/templates/w.r3.at.j2 +++ b/ansible/roles/web/r3redirects/templates/w.r3.at.j2 @@ -15,6 +15,7 @@ server { root {{ r3rsrv.rootdir }}; access_log off; + error_log syslog:server=unix:/dev/log,facility=local1,severity=info; location / { return 302 https://doku.realraum.at$request_uri; diff --git a/ansible/roles/web/r3redirects/templates/wiki.realraum.at.j2 b/ansible/roles/web/r3redirects/templates/wiki.realraum.at.j2 index 974e7f8..769cd65 100644 --- a/ansible/roles/web/r3redirects/templates/wiki.realraum.at.j2 +++ b/ansible/roles/web/r3redirects/templates/wiki.realraum.at.j2 @@ -15,6 +15,7 @@ server { root {{ r3rsrv.rootdir }}; access_log off; + error_log syslog:server=unix:/dev/log,facility=local1,severity=info; location / { return 302 https://doku.realraum.at$request_uri; diff --git a/ansible/roles/web/r3redirects/templates/www.realraum.at.j2 b/ansible/roles/web/r3redirects/templates/www.realraum.at.j2 index a3309e5..6b05f9b 100644 --- a/ansible/roles/web/r3redirects/templates/www.realraum.at.j2 +++ b/ansible/roles/web/r3redirects/templates/www.realraum.at.j2 @@ -21,6 +21,8 @@ server { root {{ r3rsrv.rootdir }}; access_log off; + error_log syslog:server=unix:/dev/log,facility=local1,severity=info; + # rewrite_log on; diff --git a/ansible/roles/web/r3status/templates/nginx.j2 b/ansible/roles/web/r3status/templates/nginx.j2 index 6b05eb7..fcc2dbe 100644 --- a/ansible/roles/web/r3status/templates/nginx.j2 +++ b/ansible/roles/web/r3status/templates/nginx.j2 @@ -14,6 +14,9 @@ server { root /srv/r3status/www; + access_log off; + error_log syslog:server=unix:/dev/log,facility=local1,severity=info; + location = /spaceapi.json { alias {{ r3status_spaceapi_path }}/spaceapi.json; add_header Access-Control-Allow-Origin "*"; -- 1.7.10.4