From b506056b0a5b748a328500f5a1feba10dc55e3bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Flor=C3=A9al=20Toumikian?= <floreal@nimukaito.net>
Date: Fri, 2 Aug 2024 19:05:33 +0200
Subject: [PATCH] Upgraded movim from 0.24.1 to 0.26

---
 playbooks/tasks/chat/files/ejabberd.yml | 25 ++++++++++++++-----------
 playbooks/tasks/chat/movim.yml          |  1 +
 playbooks/vars.yml                      |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/playbooks/tasks/chat/files/ejabberd.yml b/playbooks/tasks/chat/files/ejabberd.yml
index 0085df2..d46d957 100644
--- a/playbooks/tasks/chat/files/ejabberd.yml
+++ b/playbooks/tasks/chat/files/ejabberd.yml
@@ -1,4 +1,4 @@
-loglevel: warning
+loglevel: info
 
 log_rotate_count: 0
 
@@ -48,7 +48,7 @@ s2s_protocol_options: 'TLS_OPTIONS'
 listen:
   -
     port: 5222
-    ip: "137.74.82.131"
+    ip: "10.246.201.4"
     module: ejabberd_c2s
     max_stanza_size: 262144
     shaper: c2s_shaper
@@ -56,7 +56,7 @@ listen:
     starttls: true
   -
     port: 5223
-    ip: "137.74.82.131"
+    ip: "10.246.201.4"
     module: ejabberd_c2s
     max_stanza_size: 262144
     shaper: c2s_shaper
@@ -64,12 +64,12 @@ listen:
     tls: true
   -
     port: 5269
-    ip: "137.74.82.131"
+    ip: "10.246.201.4"
     module: ejabberd_s2s_in
     max_stanza_size: 524288
   -
     port: 5443
-    ip: "137.74.82.131"
+    ip: "10.246.201.4"
     module: ejabberd_http
     tls: true
     protocol_options: 'TLS_OPTIONS'
@@ -82,8 +82,9 @@ listen:
     custom_headers:
       "Access-Control-Allow-Origin": "*"
       "Access-Control-Allow-Methods": "OPTIONS, HEAD, GET, PUT"
-      "Access-Control-Allow-Headers": "Authorization"
+      "Access-Control-Allow-Headers": "content-type"
       "Access-Control-Allow-Credentials": "true"
+      "Access-Control-Max-Age": "86400"
 #  -
 #    port: 5280
 #    module: ejabberd_http
@@ -94,14 +95,14 @@ listen:
 #      /admin: ejabberd_web_admin
   -
     port: 3478
-    ip: "137.74.82.131"
+    ip: "10.246.201.4"
     transport: udp
     module: ejabberd_stun
     use_turn: true
     turn_ipv4_address: "137.74.82.131"
   -
     port: 1883
-    ip: "137.74.82.131"
+    ip: "10.246.201.4"
     module: mod_mqtt
     backlog: 1000
 
@@ -125,9 +126,13 @@ acl:
     user:
       - "stupeflo@trans13nrv.eu.org"
       - "llowin@trans13nrv.eu.org"
+      - "saram@trans13nrv.eu.org"
+      - "margot@trans13nrv.eu.org"
 
   local:
     user_regexp: ""
+    server:
+      - "trans13nrv.eu.org"
   loopback:
     ip:
       - 127.0.0.0/8
@@ -219,10 +224,8 @@ modules:
     file_mode: "0640"
     dir_mode: "2750"
     docroot: "/opt/ejabberd/upload/@HOST@"
-    put_url: "https://@HOST@:8443/upload"
+    put_url: "https://@HOST@:5443/upload"
     thumbnail: false
-    hosts:
-      - upload.trans13nrv.eu.org
   mod_last: {}
   mod_mam:
     ## Mnesia is limited to 2GB, better to use an SQL backend
diff --git a/playbooks/tasks/chat/movim.yml b/playbooks/tasks/chat/movim.yml
index 571ce0f..eff6d14 100644
--- a/playbooks/tasks/chat/movim.yml
+++ b/playbooks/tasks/chat/movim.yml
@@ -52,6 +52,7 @@
         argv:
           - git
           - fetch
+          - --tags
         chdir: "{{ movim.path }}"
       become: true
       become_user: "{{ www.user }}"
diff --git a/playbooks/vars.yml b/playbooks/vars.yml
index f8c7687..c5f584d 100644
--- a/playbooks/vars.yml
+++ b/playbooks/vars.yml
@@ -15,7 +15,7 @@ www:
   user: www-data
   group: www-data
 movim:
-  version: "0.24.1"
+  version: "0.26"
   path: /var/www/chat.trans13nrv.eu.org
   domain: chat.trans13nrv.eu.org
 postgres: