Merge pull request #45 from YunoHost-Apps/testing

Testing

README.md

@@ -12,13 +12,17 @@ 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.25~ynh1](https://img.shields.io/badge/Version-3.4.25~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/send/)
+[![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/)
 
 <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>
 <a href="https://github.com/YunoHost-Apps/send_ynh/issues"><img height="100px" src="https://github.com/YunoHost/yunohost-artwork/raw/refs/heads/main/badges/neopossum-badges/badge_report_an_issue.svg"/></a>
 </div>
 
+
+## Screenshots
+![Screenshot of Send](./doc/screenshots/screenshot.png)
+
 ## 📦 Developer info
 
 [![Automatic tests level](https://apps.yunohost.org/badge/cilevel/send)](https://ci-apps.yunohost.org/ci/apps/send/)

conf/.env

@@ -1,6 +0,0 @@
-NODE_ENV=production
-BASE_URL=https://__DOMAIN__
-IP_ADDRESS=127.0.0.7
-PORT=__PORT__
-REDIS_DB=__REDIS_DB__
-FILE_DIR=__DATA_DIR__

conf/systemd.service

@@ -7,7 +7,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
-EnvironmentFile=__INSTALL_DIR__/.env
+Environment="NODE_ENV=production"
 Environment="PATH=__PATH_WITH_NODEJS__"
 ExecStart=__NODEJS_DIR__/node __INSTALL_DIR__/server/bin/prod.js
 Restart=always

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.25~ynh1"
+version = "3.4.27~ynh1"
 
 maintainers = []
 
@@ -18,13 +18,12 @@ demo = "https://send.vis.ee/"
 code = "https://github.com/timvisee/send"
 
 [integration]
-yunohost = ">= 12.0.9"
+yunohost = ">= 12.1.17"
 helpers_version = "2.1"
 architectures = ["amd64", "arm64", "armhf"]
 multi_instance = true
 
 ldap = false
-
 sso = false
 
 disk = "50M"
@@ -43,8 +42,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/timvisee/send/archive/refs/tags/v3.4.25.tar.gz"
-        sha256 = "826224832ac8facdd368f9960d99afdef0a549d92b003af1d93bc271b6fa036a"
+        url = "https://github.com/timvisee/send/archive/refs/tags/v3.4.27.tar.gz"
+        sha256 = "fda2db869f3affbaf1fa025501c8b32b92cd85d350a1424b20db7f9164dce301"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.ports]
@@ -53,8 +52,6 @@ ram.runtime = "50M"
 
     [resources.install_dir]
 
-    [resources.data_dir]
-    
     [resources.permissions]
     main.url = "/"
     main.additional_urls = ["/api/upload"]
@@ -73,3 +70,6 @@ ram.runtime = "50M"
 
     [resources.apt]
     packages = "redis-server"
+
+    [resources.nodejs]
+    version = "16"

scripts/_common.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-#=================================================
-# COMMON VARIABLES AND CUSTOM HELPERS
-#=================================================
-
-nodejs_version="16"

scripts/backup

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
 ynh_print_info "Declaring files to be backed up..."
@@ -11,12 +10,6 @@ ynh_print_info "Declaring files to be backed up..."
 
 ynh_backup "$install_dir"
 
-#=================================================
-# BACKUP THE DATA DIR
-#=================================================
-
-ynh_backup "$data_dir"
-
 #=================================================
 # SYSTEM CONFIGURATION
 #=================================================

scripts/change_url

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================

scripts/install

@@ -1,15 +1,7 @@
 #!/bin/bash
 
-source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression "Installing dependencies..."
-
-ynh_nodejs_install
-
 #=================================================
 # CREATE A REDIS DATABASE
 #=================================================
@@ -43,7 +35,7 @@ yunohost service add "$app" --description="Simple, private file sharing" --log="
 #=================================================
 ynh_script_progression "Adding $app's configuration..."
 
-ynh_config_add --template=".env" --destination="$install_dir/.env"
+ynh_config_add --template="config.js" --destination="$install_dir/server/config.js"
 
 #=================================================
 # BUILD APP

scripts/remove

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -18,8 +17,6 @@ ynh_redis_remove_db "$redis_db"
 
 ynh_config_remove_nginx
 
-ynh_nodejs_remove
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -12,20 +11,11 @@ ynh_restore "$install_dir"
 
 chmod +x "$install_dir/server/bin/prod.js"
 
-#=================================================
-# RESTORE THE DATA DIRECTORY
-#=================================================
-ynh_script_progression "Restoring the data directory..."
-
-ynh_restore "$data_dir"
-
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
 ynh_script_progression "Reinstalling dependencies..."
 
-ynh_nodejs_install
-
 ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf"
 
 ynh_restore "/etc/systemd/system/$app.service"

scripts/upgrade

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -22,17 +21,10 @@ ynh_config_remove_logrotate
 #=================================================
 ynh_script_progression "Upgrading source files..."
 
-ynh_setup_source --dest_dir="$install_dir" --keep=".env" --full_replace
+ynh_setup_source --dest_dir="$install_dir" --keep="server/config.js" --full_replace
 
 chmod +x "$install_dir/server/bin/prod.js"
 
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression "Upgrading dependencies..."
-
-ynh_nodejs_install
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -49,7 +41,7 @@ yunohost service add "$app" --description="Simple, private file sharing" --log="
 #=================================================
 ynh_script_progression "Updating configuration..."
 
-ynh_config_add --template=".env" --destination="$install_dir/.env"
+ynh_config_add --template="config.js" --destination="$install_dir/server/config.js"
 
 #=================================================
 # BUILD APP