Upgrade Matrix

Reviewed-on: https://git.data.coop/data.coop/ansible/pulls/223
Reviewed-by: benjaoming <benjaoming@data.coop>

.gitignore

@@ -4,4 +4,5 @@
 *.log
 .idea/
 .ansible/
+.vscode/
 venv/

roles/docker/defaults/main.yml

@@ -71,7 +71,7 @@ services:
     domain: "cloud.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/nextcloud"
     pre_deploy_tasks: true
-    version: 28-apache
+    version: 31-apache
     postgres_version: "10"
     redis_version: 7-alpine
     allowed_sender_domain: true
@@ -94,7 +94,7 @@ services:
     domain: "matrix.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/matrix"
     pre_deploy_tasks: true
-    version: v1.114.0
+    version: v1.127.1
     postgres_version: 15-alpine
     allowed_sender_domain: true
 
@@ -164,7 +164,8 @@ services:
   drone:
     domain: "drone.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/drone"
-    version: "1"
+    version: "2.26.0"
+    runner_version: "1.8"
 
   mailu:
     domain: "mail.{{ base_domain }}"
@@ -181,7 +182,7 @@ services:
     volume_folder: "{{ volume_root_folder }}/mastodon"
     pre_deploy_tasks: true
     post_deploy_tasks: true
-    version: v4.2.10
+    version: v4.2.19
     postgres_version: 14-alpine
     redis_version: 6-alpine
     allowed_sender_domain: true
@@ -225,13 +226,13 @@ services:
     domain: forum.fedi.dk
     volume_folder: "{{ volume_root_folder }}/fedidk-nodebb"
     pre_deploy_tasks: true
-    version: "4.0.4"
+    version: "4.1.1"
     nginx_version: 1.27.4-alpine
     redis_version: 7.4.2-alpine
-    mongodb_version: 7-jammy
+    mongodb_version: 7.0.17-jammy
     allowed_sender_domain: true
-    nodebb_port_begin: 4567
+    port_begin: 4567
-    nodebb_processes: 8
+    workers: 16
 
   ### Uptime monitoring ###
   uptime_kuma:

roles/docker/files/vhost/mastodon

@@ -1,2 +1,2 @@
 listen 3000;
-client_max_body_size 50M; # default is 1M
+client_max_body_size 100M; # default is 1M

roles/docker/handlers/main.yml

@@ -1,6 +1,6 @@
 # vim: ft=yaml.ansible
 ---
-- name: restart nginx
+- name: Reload nginx
-  command: docker compose restart proxy
+  command: docker compose exec proxy sh -c "nginx -t && nginx -s reload"
   args:
     chdir: "{{ services.nginx_proxy.volume_folder }}"

roles/docker/tasks/pre_deploy/data_coop_website.yml

@@ -4,8 +4,10 @@
   copy:
     src: vhost/base_domain
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.data_coop_website.domain }}"
+  notify: "Reload nginx"
 
 - name: Upload vhost config for WWW domain
   copy:
     src: vhost/www.base_domain
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.data_coop_website.www_domain }}"
+  notify: "Reload nginx"

roles/docker/tasks/pre_deploy/element.yml

@@ -19,3 +19,4 @@
   copy:
     src: vhost/element
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.element.domain }}"
+  notify: "Reload nginx"

roles/docker/tasks/pre_deploy/fedi_dk_nodebb.yml

@@ -67,3 +67,4 @@
   copy:
     src: vhost/fedi_dk_nodebb
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.fedi_dk_nodebb.domain }}"
+  notify: "Reload nginx"

roles/docker/tasks/pre_deploy/forgejo.yml

@@ -8,3 +8,4 @@
   template:
     src: forgejo/robots.txt.j2
     dest: "{{ services.forgejo.volume_folder }}/gitea/public/robots.txt"
+  notify: "Reload nginx"

roles/docker/tasks/pre_deploy/mastodon.yml

@@ -38,6 +38,7 @@
   copy:
     src: vhost/mastodon
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.mastodon.domain }}"
+  notify: "Reload nginx"
 
 - name: Upload PostgreSQL config
   copy:

roles/docker/tasks/pre_deploy/matrix.yml

@@ -22,6 +22,7 @@
   copy:
     src: vhost/matrix
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.matrix.domain }}"
+  notify: "Reload nginx"
 
 - name: Upload homeserver.yaml
   template:

roles/docker/tasks/pre_deploy/nextcloud.yml

@@ -14,4 +14,4 @@
   copy:
     src: vhost/nextcloud
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.nextcloud.domain }}"
-  notify: "restart nginx"
+  notify: "Reload nginx"

roles/docker/tasks/pre_deploy/uptime_kuma.yml

@@ -2,8 +2,10 @@
   copy:
     src: vhost/uptime_kuma
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.uptime_kuma.domain }}_location"
+  notify: "Reload nginx"
 
 - name: Upload vhost config for status domain
   copy:
     src: vhost/uptime_kuma
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.uptime_kuma.status_domain }}_location"
+  notify: "Reload nginx"

roles/docker/templates/compose-files/drone.yml.j2

@@ -1,6 +1,4 @@
 # vim: ft=yaml.docker-compose
-version: "3.8"
-
 services:
   app:
     image: drone/drone:{{ services.drone.version }}
@@ -24,7 +22,7 @@ services:
       LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
 
   runner:
-    image: drone/drone-runner-docker:{{ services.drone.version }}
+    image: drone/drone-runner-docker:{{ services.drone.runner_version }}
     restart: unless-stopped
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"

roles/docker/templates/compose-files/fedi_dk_nodebb.yml.j2

@@ -8,11 +8,18 @@ services:
     volumes:
       - "./nginx:/etc/nginx/conf.d:ro"
       - "./build:/usr/src/app/build:ro"
+      - "./uploads:/usr/src/app/public/uploads:ro"
     environment:
       VIRTUAL_HOST: {{ services.fedi_dk_nodebb.domain }}
       VIRTUAL_PORT: 80
       LETSENCRYPT_HOST: {{ services.fedi_dk_nodebb.domain }}
       LETSENCRYPT_EMAIL: {{ letsencrypt_email }}
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "50m"
+        max-file: 10
+        compress: "true"
     depends_on:
       - app
 

roles/docker/templates/compose-files/matrix.yml.j2

@@ -1,6 +1,4 @@
 # vim: ft=yaml.docker-compose
-version: "3.8"
-
 services:
   postgres:
     image: postgres:{{ services.matrix.postgres_version }}

roles/docker/templates/compose-files/nextcloud.yml.j2

@@ -1,6 +1,4 @@
 # vim: ft=yaml.docker-compose
-version: "3.8"
-
 services:
   postgres:
     image: postgres:{{ services.nextcloud.postgres_version }}

roles/docker/templates/fedi_dk_nodebb/config.json.j2

@@ -2,8 +2,8 @@
     "url": "https://{{ services.fedi_dk_nodebb.domain }}",
     "secret": "{{ fedi_dk_nodebb_secrets.secret_value }}",
     "database": "mongo",
-    "port": [{% for port in range(services.fedi_dk_nodebb.nodebb_port_begin,
+    "port": [{% for port in range(services.fedi_dk_nodebb.port_begin,
-                                  services.fedi_dk_nodebb.nodebb_port_begin + services.fedi_dk_nodebb.nodebb_processes)
+                                  services.fedi_dk_nodebb.port_begin + services.fedi_dk_nodebb.workers)
     %}"{{ port }}"{% if not loop.last %}, {% endif %}{% endfor %}],
     "mongo": {
         "host": "mongodb",

roles/docker/templates/fedi_dk_nodebb/nginx/http.conf.j2

@@ -11,8 +11,8 @@ map $http_upgrade $connection_upgrade {
 
 upstream workers {
     ip_hash;
-{% for port in range(services.fedi_dk_nodebb.nodebb_port_begin,
+{% for port in range(services.fedi_dk_nodebb.port_begin,
-                     services.fedi_dk_nodebb.nodebb_port_begin + services.fedi_dk_nodebb.nodebb_processes) %}
+                     services.fedi_dk_nodebb.port_begin + services.fedi_dk_nodebb.workers) %}
     server app.nodebb:{{ port }};
 {% endfor %}
 }
@@ -45,7 +45,7 @@ server {
 
     location ~ ^/assets/(.*) {
         root /usr/src/app;
-        try_files /build/public/$1 @nodebb;
+        try_files /build/public/$1 /public/$1 @nodebb;
     }
 
     location / {