Merge branch 'testing' into env

README.md

@@ -12,7 +12,7 @@ File sharing which allows to send encrypted files
 
 [![🌐 Official app website](https://img.shields.io/badge/Official_app_website-darkgreen?style=for-the-badge)](https://send.vis.ee/)
 [![App Demo](https://img.shields.io/badge/App_Demo-blue?style=for-the-badge)](https://send.vis.ee/)
-[![Version: 3.4.27~ynh1](https://img.shields.io/badge/Version-3.4.27~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/send/)
+[![Version: 3.5.0~ynh1](https://img.shields.io/badge/Version-3.5.0~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/send/)
 
 <div align="center">
 <a href="https://apps.yunohost.org/app/send"><img height="100px" src="https://github.com/YunoHost/yunohost-artwork/raw/refs/heads/main/badges/neopossum-badges/badge_more_info_on_the_appstore.svg"/></a>

conf/nginx.conf

@@ -1,22 +1,14 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
-  proxy_pass       http://127.0.0.1:__PORT__;
+  proxy_pass http://127.0.0.1:__PORT__;
-  proxy_set_header Host $host; 
+  include    proxy_params_no_auth;
-  proxy_set_header X-Real-IP $remote_addr; 
-  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 
-  proxy_set_header X-Forwarded-Proto $scheme;
 }
 
 location /api/ws {
 
   proxy_pass http://127.0.0.1:__PORT__;
-  proxy_set_header X-Real-IP $remote_addr;
+  include    proxy_params_no_auth;
-  proxy_set_header Host $host;
-  proxy_http_version 1.1;
-  proxy_set_header Upgrade $http_upgrade;
-  proxy_set_header Connection $connection_upgrade;
-  proxy_set_header Connection "";
   proxy_connect_timeout  4000s;
   proxy_read_timeout     4000s;
 }

manifest.toml

@@ -7,7 +7,7 @@ name = "Send"
 description.en = "File sharing which allows to send encrypted files"
 description.fr = "Partage de fichiers qui permet d'envoyer des fichiers chiffrés"
 
-version = "3.4.27~ynh1"
+version = "3.5.0~ynh1"
 
 maintainers = []
 
@@ -18,7 +18,7 @@ demo = "https://send.vis.ee/"
 code = "https://github.com/timvisee/send"
 
 [integration]
-yunohost = ">= 12.1.17"
+yunohost = ">= 12.1.40"
 helpers_version = "2.1"
 architectures = ["amd64", "arm64", "armhf"]
 multi_instance = true
@@ -43,8 +43,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/timvisee/send/archive/refs/tags/v3.4.27.tar.gz"
+        url = "https://github.com/timvisee/send/archive/refs/tags/v3.5.0.tar.gz"
-        sha256 = "fda2db869f3affbaf1fa025501c8b32b92cd85d350a1424b20db7f9164dce301"
+        sha256 = "d8e483c0ff1377ed9773dfe888af8b45a68a08769afb1e31eddb32fff79c0190"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.ports]
@@ -75,4 +75,4 @@ ram.runtime = "50M"
     packages = "redis-server"
 
     [resources.nodejs]
-    version = "16"
+    version = "26"

scripts/change_url

@@ -7,7 +7,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression "Stopping $app's systemd service..."
 
-ynh_systemctl --service="$app" --action="stop" --log_path="systemd"
+ynh_systemctl --service="$app" --action="stop"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
@@ -28,7 +28,7 @@ ynh_config_add --template="config.js" --destination="$install_dir/server/config.
 #=================================================
 ynh_script_progression "Starting $app's systemd service..."
 
-ynh_systemctl --service="$app" --action="start" --log_path="systemd"
+ynh_systemctl --service="$app" --action="start"
 
 #=================================================
 # END OF SCRIPT

scripts/install

@@ -52,7 +52,7 @@ popd
 #=================================================
 ynh_script_progression "Starting $app's systemd service..."
 
-ynh_systemctl --service="$app" --action="start" --log_path="systemd"
+ynh_systemctl --service="$app" --action="start"
 
 #=================================================
 # END OF SCRIPT

scripts/restore

@@ -35,7 +35,7 @@ yunohost service add "$app" --description="Simple, private file sharing" --log="
 #=================================================
 ynh_script_progression "Starting $app's systemd service..."
 
-ynh_systemctl --service="$app" --action="start" --log_path="systemd"
+ynh_systemctl --service="$app" --action="start"
 
 ynh_systemctl --service=nginx --action=reload
 

scripts/upgrade

@@ -7,7 +7,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression "Stopping $app's systemd service..."
 
-ynh_systemctl --service="$app" --action="stop" --log_path="systemd"
+ynh_systemctl --service="$app" --action="stop"
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -58,7 +58,7 @@ popd
 #=================================================
 ynh_script_progression "Starting $app's systemd service..."
 
-ynh_systemctl --service="$app" --action="start" --log_path="systemd"
+ynh_systemctl --service="$app" --action="start"
 
 #=================================================
 # END OF SCRIPT