From d647a6cd3165a8461f6f6792c5fc198947ee913a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 24 May 2024 08:54:56 +0200
Subject: [PATCH] fix

---
 conf/nginx.conf | 18 ++++++++++++------
 manifest.toml   |  7 ++++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 4287837..6bff3c0 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,9 +1,4 @@
-set $main_domain "__DOMAIN__";
-set $sandbox_domain "__SANDBOXDOMAIN__";
-set $allowed_origins "https://${sandbox_domain}";
-set $api_domain "__DOMAIN__";
-set $files_domain "__DOMAIN__";
-ssl_ecdh_curve secp384r1;
+server_name __DOMAIN__ __SANDBOXDOMAIN__;
 
 location / {
     proxy_pass            http://127.0.0.1:__PORT__;
@@ -16,3 +11,14 @@ location / {
     proxy_set_header      Upgrade $http_upgrade;
     proxy_set_header      Connection upgrade;
 }
+
+location ^~ /cryptpad_websocket {
+    proxy_pass            http://127.0.0.1:__SOCKET_PORT__;
+    proxy_set_header      X-Real-IP $remote_addr;
+    proxy_set_header      Host $host;
+    proxy_set_header      X-Forwarded-For $proxy_add_x_forwarded_for;
+
+    proxy_http_version    1.1;
+    proxy_set_header      Upgrade $http_upgrade;
+    proxy_set_header      Connection upgrade;
+}
diff --git a/manifest.toml b/manifest.toml
index f251a2c..4eabf5e 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "CryptPad"
 description.en = "Collaborative office suite that is end-to-end encrypted"
 description.fr = "Suite bureautique collaborative chiffrée de bout en bout"
 
-version = "5.7.0~ynh1"
+version = "2024.3.1~ynh1"
 
 maintainers = ["ddataa"]
 
@@ -48,12 +48,13 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/xwiki-labs/cryptpad/archive/refs/tags/5.7.0.tar.gz"
-        sha256 = "87cf091f2d0f26bc4d2df53460bade79e3b0d1804dfe6ef1e592ceb2654cd21f"
+        url = "https://github.com/cryptpad/cryptpad/archive/refs/tags/2024.3.1.tar.gz"
+        sha256 = "9149c55f09b245cde2d295efe1f373c394db7a7652ba32432d05dc11c2ddb697"
         autoupdate.strategy = "latest_github_release"
 
     [resources.ports]
     main.default = 3000
+    socket.default = 3003
 
     [resources.system_user]