Merge branch 'testing' into config-panel

ALL_README.md

@@ -7,6 +7,5 @@
 - [Le o README en galego](README_gl.md)
 - [Baca README dalam bahasa bahasa Indonesia](README_id.md)
 - [Lees de README in het Nederlands](README_nl.md)
-- [Przeczytaj README w języku polski](README_pl.md)
 - [Прочитать README на русский](README_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -5,9 +5,7 @@ It shall NOT be edited by hand.
 
 # Send for YunoHost
 
-[![Integration level](https://apps.yunohost.org/badge/integration/send)](https://ci-apps.yunohost.org/ci/apps/send/)
+[![Integration level](https://dash.yunohost.org/integration/send.svg)](https://ci-apps.yunohost.org/ci/apps/send/) ![Working status](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg)
-![Working status](https://apps.yunohost.org/badge/state/send)
-![Maintenance status](https://apps.yunohost.org/badge/maintained/send)
 
 [![Install Send with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send)
 
@@ -22,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm
 Send is a file sharing experiment which allows you to send encrypted files to other users.
 
 
-**Shipped version:** 3.4.23~ynh6
+**Shipped version:** 3.4.23~ynh5
 
 **Demo:** <https://send.vis.ee/>
 

README_es.md

@@ -5,9 +5,7 @@ No se debe editar a mano.
 
 # Send para Yunohost
 
-[![Nivel de integración](https://apps.yunohost.org/badge/integration/send)](https://ci-apps.yunohost.org/ci/apps/send/)
+[![Nivel de integración](https://dash.yunohost.org/integration/send.svg)](https://ci-apps.yunohost.org/ci/apps/send/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg)
-![Estado funcional](https://apps.yunohost.org/badge/state/send)
-![Estado En Mantención](https://apps.yunohost.org/badge/maintained/send)
 
 [![Instalar Send con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send)
 
@@ -22,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm
 Send is a file sharing experiment which allows you to send encrypted files to other users.
 
 
-**Versión actual:** 3.4.23~ynh6
+**Versión actual:** 3.4.23~ynh5
 
 **Demo:** <https://send.vis.ee/>
 

README_eu.md

@@ -5,9 +5,7 @@ EZ editatu eskuz.
 
 # Send YunoHost-erako
 
-[![Integrazio maila](https://apps.yunohost.org/badge/integration/send)](https://ci-apps.yunohost.org/ci/apps/send/)
+[![Integrazio maila](https://dash.yunohost.org/integration/send.svg)](https://ci-apps.yunohost.org/ci/apps/send/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg)
-![Funtzionamendu egoera](https://apps.yunohost.org/badge/state/send)
-![Mantentze egoera](https://apps.yunohost.org/badge/maintained/send)
 
 [![Instalatu Send YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send)
 
@@ -22,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm
 Send is a file sharing experiment which allows you to send encrypted files to other users.
 
 
-**Paketatutako bertsioa:** 3.4.23~ynh6
+**Paketatutako bertsioa:** 3.4.23~ynh5
 
 **Demoa:** <https://send.vis.ee/>
 

README_fr.md

@@ -5,9 +5,7 @@ Il NE doit PAS être modifié à la main.
 
 # Send pour YunoHost
 
-[![Niveau d’intégration](https://apps.yunohost.org/badge/integration/send)](https://ci-apps.yunohost.org/ci/apps/send/)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/send.svg)](https://ci-apps.yunohost.org/ci/apps/send/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg)
-![Statut du fonctionnement](https://apps.yunohost.org/badge/state/send)
-![Statut de maintenance](https://apps.yunohost.org/badge/maintained/send)
 
 [![Installer Send avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send)
 
@@ -22,7 +20,7 @@ Un fork du Firefox Send de Mozilla. Mozilla a arrêté Send, et ce fork est un e
 Send est une expérience de partage de fichiers qui permet d'envoyer des fichiers chiffrés à d'autres utilisateurs.
 
 
-**Version incluse :** 3.4.23~ynh6
+**Version incluse :** 3.4.23~ynh5
 
 **Démo :** <https://send.vis.ee/>
 

README_gl.md

@@ -5,9 +5,7 @@ NON debe editarse manualmente.
 
 # Send para YunoHost
 
-[![Nivel de integración](https://apps.yunohost.org/badge/integration/send)](https://ci-apps.yunohost.org/ci/apps/send/)
+[![Nivel de integración](https://dash.yunohost.org/integration/send.svg)](https://ci-apps.yunohost.org/ci/apps/send/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg)
-![Estado de funcionamento](https://apps.yunohost.org/badge/state/send)
-![Estado de mantemento](https://apps.yunohost.org/badge/maintained/send)
 
 [![Instalar Send con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send)
 
@@ -22,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm
 Send is a file sharing experiment which allows you to send encrypted files to other users.
 
 
-**Versión proporcionada:** 3.4.23~ynh6
+**Versión proporcionada:** 3.4.23~ynh5
 
 **Demo:** <https://send.vis.ee/>
 

README_id.md

@@ -5,9 +5,7 @@ Ini TIDAK boleh diedit dengan tangan.
 
 # Send untuk YunoHost
 
-[![Tingkat integrasi](https://apps.yunohost.org/badge/integration/send)](https://ci-apps.yunohost.org/ci/apps/send/)
+[![Tingkat integrasi](https://dash.yunohost.org/integration/send.svg)](https://ci-apps.yunohost.org/ci/apps/send/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg)
-![Status kerja](https://apps.yunohost.org/badge/state/send)
-![Status pemeliharaan](https://apps.yunohost.org/badge/maintained/send)
 
 [![Pasang Send dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send)
 
@@ -22,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm
 Send is a file sharing experiment which allows you to send encrypted files to other users.
 
 
-**Versi terkirim:** 3.4.23~ynh6
+**Versi terkirim:** 3.4.23~ynh5
 
 **Demo:** <https://send.vis.ee/>
 

README_nl.md

@@ -5,9 +5,7 @@ Hij mag NIET handmatig aangepast worden.
 
 # Send voor Yunohost
 
-[![Integratieniveau](https://apps.yunohost.org/badge/integration/send)](https://ci-apps.yunohost.org/ci/apps/send/)
+[![Integratieniveau](https://dash.yunohost.org/integration/send.svg)](https://ci-apps.yunohost.org/ci/apps/send/) ![Mate van functioneren](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![Onderhoudsstatus](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg)
-![Mate van functioneren](https://apps.yunohost.org/badge/state/send)
-![Onderhoudsstatus](https://apps.yunohost.org/badge/maintained/send)
 
 [![Send met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send)
 
@@ -22,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm
 Send is a file sharing experiment which allows you to send encrypted files to other users.
 
 
-**Geleverde versie:** 3.4.23~ynh6
+**Geleverde versie:** 3.4.23~ynh5
 
 **Demo:** <https://send.vis.ee/>
 

README_pl.md

@@ -1,52 +0,0 @@
-<!--
-To README zostało automatycznie wygenerowane przez <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
-Nie powinno być ono edytowane ręcznie.
--->
-
-# Send dla YunoHost
-
-[![Poziom integracji](https://apps.yunohost.org/badge/integration/send)](https://ci-apps.yunohost.org/ci/apps/send/)
-![Status działania](https://apps.yunohost.org/badge/state/send)
-![Status utrzymania](https://apps.yunohost.org/badge/maintained/send)
-
-[![Zainstaluj Send z YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send)
-
-*[Przeczytaj plik README w innym języku.](./ALL_README.md)*
-
-> *Ta aplikacja pozwala na szybką i prostą instalację Send na serwerze YunoHost.*  
-> *Jeżeli nie masz YunoHost zapoznaj się z [poradnikiem](https://yunohost.org/install) instalacji.*
-
-## Przegląd
-
-A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a community effort to keep the project up-to-date and alive.
-Send is a file sharing experiment which allows you to send encrypted files to other users.
-
-
-**Dostarczona wersja:** 3.4.23~ynh6
-
-**Demo:** <https://send.vis.ee/>
-
-## Zrzuty ekranu
-
-![Zrzut ekranu z Send](./doc/screenshots/screenshot.png)
-
-## Dokumentacja i zasoby
-
-- Oficjalna strona aplikacji: <https://send.vis.ee/>
-- Repozytorium z kodem źródłowym: <https://github.com/timvisee/send>
-- Sklep YunoHost: <https://apps.yunohost.org/app/send>
-- Zgłaszanie błędów: <https://github.com/YunoHost-Apps/send_ynh/issues>
-
-## Informacje od twórców
-
-Wyślij swój pull request do [gałęzi `testing`](https://github.com/YunoHost-Apps/send_ynh/tree/testing).
-
-Aby wypróbować gałąź `testing` postępuj zgodnie z instrukcjami:
-
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug
-lub
-sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug
-```
-
-**Więcej informacji o tworzeniu paczek aplikacji:** <https://yunohost.org/packaging_apps>

README_ru.md

@@ -5,9 +5,7 @@
 
 # Send для YunoHost
 
-[![Уровень интеграции](https://apps.yunohost.org/badge/integration/send)](https://ci-apps.yunohost.org/ci/apps/send/)
+[![Уровень интеграции](https://dash.yunohost.org/integration/send.svg)](https://ci-apps.yunohost.org/ci/apps/send/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg)
-![Состояние работы](https://apps.yunohost.org/badge/state/send)
-![Состояние сопровождения](https://apps.yunohost.org/badge/maintained/send)
 
 [![Установите Send с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send)
 
@@ -22,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm
 Send is a file sharing experiment which allows you to send encrypted files to other users.
 
 
-**Поставляемая версия:** 3.4.23~ynh6
+**Поставляемая версия:** 3.4.23~ynh5
 
 **Демо-версия:** <https://send.vis.ee/>
 

README_zh_Hans.md

@@ -5,9 +5,7 @@
 
 # YunoHost 上的 Send
 
-[![集成程度](https://apps.yunohost.org/badge/integration/send)](https://ci-apps.yunohost.org/ci/apps/send/)
+[![集成程度](https://dash.yunohost.org/integration/send.svg)](https://ci-apps.yunohost.org/ci/apps/send/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg)
-![工作状态](https://apps.yunohost.org/badge/state/send)
-![维护状态](https://apps.yunohost.org/badge/maintained/send)
 
 [![使用 YunoHost 安装 Send](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send)
 
@@ -22,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm
 Send is a file sharing experiment which allows you to send encrypted files to other users.
 
 
-**分发版本：** 3.4.23~ynh6
+**分发版本：** 3.4.23~ynh5
 
 **演示：** <https://send.vis.ee/>
 

conf/config.js

@@ -1,3 +1,11 @@
+// ⚠️ IMPORTANT WARNING: do NOT edit this config file by hand,
+// else your modifications will be ERASED at each update of the Send package!
+// Instead, use the config panel in your web admin interface:
+// Applications ➡️ Send ➡️ Config panel ➡️ do your config edit ➡️ Save
+// Most of the relevant settings are available in the config panel, if you're
+// missing one, open an issue: https://github.com/YunoHost-Apps/send_ynh/issues
+
+
 const convict = require('convict');
 const convict_format_with_validator = require('convict-format-with-validator');
 const { tmpdir } = require('os');
@@ -74,7 +82,7 @@ const conf = convict({
   },
   max_downloads: {
     format: Number,
-    default: __MAX_DOWNLOADS__,
+    default: 100,
     env: 'MAX_DOWNLOADS'
   },
   max_files_per_archive: {
@@ -155,7 +163,7 @@ const conf = convict({
   },
   max_file_size: {
     format: Number,
-    default: __MAX_FILE_SIZE__ * 1024 * 1024,
+    default: 1024 * 1024 * 1024 * 2.5,
     env: 'MAX_FILE_SIZE'
   },
   l10n_dev: {
@@ -170,12 +178,12 @@ const conf = convict({
   },
   custom_title: {
     format: String,
-    default: '__CUSTOM_TITLE__',
+    default: 'Send',
     env: 'CUSTOM_TITLE'
   },
   custom_description: {
     format: String,
-    default: '__CUSTOM_DESCRIPTION__',
+    default: 'Encrypt and send files with a link that automatically expires to ensure your important documents don’t stay online forever.',
     env: 'CUSTOM_DESCRIPTION'
   },
   detect_base_url: {

config_panel.toml

@@ -1,44 +0,0 @@
-version = "1.0"
-
-[main]
-name.en = "Send configuration"
-name.fr = "Configuration de Send"
-services = ["__APP__"]
-
-    [main.config]
-    name.en = "Configuration Options"
-    name.fr = "Options de configuration"
-
-        [main.config.max_file_size]
-        ask.en = "Max File Size"
-        ask.fr = "Taille maximale du fichier"
-        type = "number"
-        default = "100"
-        help.en = "Choose the maximum file size allowed to send (in Mo)"
-        help.fr = "Choisissez la taille maximale du fichier autorisé à envoyer (en Mo)"
-        bind = "max_file_size:/var/www/__APP__/server/config.js"
-
-        [main.config.max_downloads]
-        ask.en = "Max downloads"
-        ask.fr = "Téléchargements maximal"
-        type = "number"
-        default = "100"
-        help.en = "Define the maximum download limit"
-        help.fr = "Définir la limite maximale du nombre de téléchargement"
-        bind = "max_downloads:/var/www/__APP__/server/config.js"
-
-        [main.config.custom_title]
-        ask.en = "Custom Title"
-        ask.fr = "Titre personnalisé"
-        type = "string"
-        help.en = "Add a custom title for Send"
-        help.fr = "Ajouter un titre personnalisé pour Send"
-        bind = "custom_title:/var/www/__APP__/server/config.js"
-
-        [main.config.custom_description]
-        ask.en = "Custom Description"
-        ask.fr = "Description personnalisée"
-        type = "string"
-        help.en = "Add a custom description for Send"
-        help.fr = "Ajouter une description personnalisée pour Send"
-        bind = "custom_description:/var/www/__APP__/server/config.js"

doc/ADMIN.md

@@ -0,0 +1 @@
+You can edit the Send settings such as the max file size, max downloads or max file expire time in the app configuration panel under your admin YunoHost interface.

doc/ADMIN_fr.md

@@ -0,0 +1 @@
+Vous pouvez configurer des paramètres tels que les taille de fichier, nombre de téléchargements ou temps d'expiration des fichiers maximums dans le panneau de configuration de l'app dans votre interface d'administration YunoHost.

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.23~ynh6"
+version = "3.4.23~ynh5"
 
 maintainers = []
 
@@ -18,13 +18,15 @@ demo = "https://send.vis.ee/"
 code = "https://github.com/timvisee/send"
 
 [integration]
-yunohost = ">= 12.0.9"
+yunohost = ">= 11.2.30"
 helpers_version = "2.1"
 architectures = ["amd64", "arm64", "armhf"]
 multi_instance = true
 
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "1G"
 ram.runtime = "50M"

scripts/_common.sh

@@ -4,4 +4,4 @@
 # COMMON VARIABLES AND CUSTOM HELPERS
 #=================================================
 
-nodejs_version="16"
+nodejs_version=16

scripts/change_url

@@ -22,8 +22,12 @@ ynh_config_change_url_nginx
 #=================================================
 ynh_script_progression "Adding $app's configuration..."
 
+domain=$new_domain
 ynh_config_add --template="config.js" --destination="$install_dir/server/config.js"
 
+#chmod 400 "$install_dir/server/config.js"
+#chown "$app:$app" "$install_dir/server/config.js"
+
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================

scripts/install

@@ -3,22 +3,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# INITIALIZE AND STORE SETTINGS
-#=================================================
-
-custom_title="Send"
-ynh_app_setting_set --key=custom_title --value="$custom_title"
-
-custom_description="Encrypt and send files with a link that automatically expires."
-ynh_app_setting_set --key=custom_description --value="$custom_description"
-
-max_file_size=100
-ynh_app_setting_set --key=max_file_size --value="$max_file_size"
-
-max_downloads=100
-ynh_app_setting_set --key=max_downloads --value="$max_downloads"
-
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
@@ -64,7 +48,7 @@ ynh_config_add --template="config.js" --destination="$install_dir/server/config.
 #=================================================
 # BUILD APP
 #=================================================
-ynh_script_progression "Building $app... (this will take some time and resources!)"
+ynh_script_progression "Building app... (this will take some time and resources!)"
 
 pushd "$install_dir"
 	ynh_hide_warnings ynh_exec_as_app npm install

scripts/upgrade

@@ -3,16 +3,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# ENSURE DOWNWARD COMPATIBILITY
-#=================================================
-ynh_script_progression "Ensuring downward compatibility..."
-
-ynh_app_setting_set_default --key=custom_title --value="send"
-ynh_app_setting_set_default --key=custom_description --value="Encrypt and send files with a link that automatically expires."
-ynh_app_setting_set_default --key=max_file_size --value=100
-ynh_app_setting_set_default --key=max_downloads --value=100
-
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================