Upgrade Mastodon + Nextcloud, reload nginx on vhost upload instead of restart

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
@@ -181,7 +181,7 @@ services:
     volume_folder: "{{ volume_root_folder }}/mastodon"
     pre_deploy_tasks: true
     post_deploy_tasks: true
-    version: v4.2.18
+    version: v4.2.19
     postgres_version: 14-alpine
     redis_version: 6-alpine
     allowed_sender_domain: true

roles/docker/handlers/main.yml

@@ -1,6 +1,6 @@
 # vim: ft=yaml.ansible
 ---
-- name: restart nginx
-  command: docker compose restart proxy
+- name: Reload nginx
+  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/nextcloud.yml.j2

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