diff --git a/ALL_README.md b/ALL_README.md deleted file mode 100644 index df3708b..0000000 --- a/ALL_README.md +++ /dev/null @@ -1,11 +0,0 @@ -# All available README files by language - -- [Read the README in English](README.md) -- [Lea el README en español](README_es.md) -- [Irakurri README euskaraz](README_eu.md) -- [Lire le README en français](README_fr.md) -- [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) -- [Прочитать README на русский](README_ru.md) -- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index d5b34bd..cf7a095 100644 --- a/README.md +++ b/README.md @@ -1,50 +1,45 @@ -# Send for YunoHost +

+ Logo of Send + Send, packaged for YunoHost +

-[![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) +File sharing which allows to send encrypted files -[![Install Send with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) +[![🌐 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.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/) -*[Read this README in other languages.](./ALL_README.md)* +
+ + +
-> *This package allows you to install Send quickly and simply on a YunoHost server.* -> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* - -## Overview - -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. - - -**Shipped version:** 3.4.23~ynh5 - -**Demo:** ## Screenshots - ![Screenshot of Send](./doc/screenshots/screenshot.png) -## Documentation and resources +## 📦 Developer info -- Official app website: -- Upstream app code repository: -- YunoHost Store: -- Report a bug: +[![Automatic tests level](https://apps.yunohost.org/badge/cilevel/send)](https://ci-apps.yunohost.org/ci/apps/send/) -## Developer info +🛠️ Upstream Send repository: -Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/send_ynh/tree/testing). +Pull request are welcome and should target the [`testing` branch](https://github.com/YunoHost-Apps/send_ynh/tree/testing). -To try the `testing` branch, please proceed like that: +The `testing` branch can be tested using: +``` +# fresh install: +sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -or -sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug +# upgrade an existing install: +sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing ``` -**More info regarding app packaging:** +### 📚 App packaging documentation + +Please see for more information. \ No newline at end of file diff --git a/README_es.md b/README_es.md deleted file mode 100644 index b4ec874..0000000 --- a/README_es.md +++ /dev/null @@ -1,50 +0,0 @@ - - -# Send para Yunohost - -[![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) - -[![Instalar Send con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) - -*[Leer este README en otros idiomas.](./ALL_README.md)* - -> *Este paquete le permite instalarSend rapidamente y simplement en un servidor YunoHost.* -> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* - -## Descripción general - -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. - - -**Versión actual:** 3.4.23~ynh5 - -**Demo:** - -## Capturas - -![Captura de Send](./doc/screenshots/screenshot.png) - -## Documentaciones y recursos - -- Sitio web oficial: -- Repositorio del código fuente oficial de la aplicación : -- Catálogo YunoHost: -- Reportar un error: - -## Información para desarrolladores - -Por favor enviar sus correcciones a la [rama `testing`](https://github.com/YunoHost-Apps/send_ynh/tree/testing). - -Para probar la rama `testing`, sigue asÍ: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -o -sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -``` - -**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md deleted file mode 100644 index 1d7a393..0000000 --- a/README_eu.md +++ /dev/null @@ -1,50 +0,0 @@ - - -# Send YunoHost-erako - -[![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) - -[![Instalatu Send YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) - -*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* - -> *Pakete honek Send YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* -> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* - -## Aurreikuspena - -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. - - -**Paketatutako bertsioa:** 3.4.23~ynh5 - -**Demoa:** - -## Pantaila-argazkiak - -![Send(r)en pantaila-argazkia](./doc/screenshots/screenshot.png) - -## Dokumentazioa eta baliabideak - -- Aplikazioaren webgune ofiziala: -- Jatorrizko aplikazioaren kode-gordailua: -- YunoHost Denda: -- Eman errore baten berri: - -## Garatzaileentzako informazioa - -Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/send_ynh/tree/testing). - -`testing` abarra probatzeko, ondorengoa egin: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -edo -sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -``` - -**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md deleted file mode 100644 index 63ff6aa..0000000 --- a/README_fr.md +++ /dev/null @@ -1,50 +0,0 @@ - - -# Send pour YunoHost - -[![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) - -[![Installer Send avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) - -*[Lire le README dans d'autres langues.](./ALL_README.md)* - -> *Ce package vous permet d’installer Send rapidement et simplement sur un serveur YunoHost.* -> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* - -## Vue d’ensemble - -Un fork du Firefox Send de Mozilla. Mozilla a arrêté Send, et ce fork est un effort de la communauté pour maintenir le projet en vie. -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~ynh5 - -**Démo :** - -## Captures d’écran - -![Capture d’écran de Send](./doc/screenshots/screenshot.png) - -## Documentations et ressources - -- Site officiel de l’app : -- Dépôt de code officiel de l’app : -- YunoHost Store : -- Signaler un bug : - -## Informations pour les développeurs - -Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/send_ynh/tree/testing). - -Pour essayer la branche `testing`, procédez comme suit : - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -ou -sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -``` - -**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md deleted file mode 100644 index c1f0aac..0000000 --- a/README_gl.md +++ /dev/null @@ -1,50 +0,0 @@ - - -# Send para YunoHost - -[![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) - -[![Instalar Send con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) - -*[Le este README en outros idiomas.](./ALL_README.md)* - -> *Este paquete permíteche instalar Send de xeito rápido e doado nun servidor YunoHost.* -> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* - -## Vista xeral - -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. - - -**Versión proporcionada:** 3.4.23~ynh5 - -**Demo:** - -## Capturas de pantalla - -![Captura de pantalla de Send](./doc/screenshots/screenshot.png) - -## Documentación e recursos - -- Web oficial da app: -- Repositorio de orixe do código: -- Tenda YunoHost: -- Informar dun problema: - -## Info de desenvolvemento - -Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/send_ynh/tree/testing). - -Para probar a rama `testing`, procede deste xeito: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -ou -sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -``` - -**Máis info sobre o empaquetado da app:** diff --git a/README_id.md b/README_id.md deleted file mode 100644 index 7b433c0..0000000 --- a/README_id.md +++ /dev/null @@ -1,50 +0,0 @@ - - -# Send untuk YunoHost - -[![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) - -[![Pasang Send dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) - -*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* - -> *Paket ini memperbolehkan Anda untuk memasang Send secara cepat dan mudah pada server YunoHost.* -> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* - -## Ringkasan - -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. - - -**Versi terkirim:** 3.4.23~ynh5 - -**Demo:** - -## Tangkapan Layar - -![Tangkapan Layar pada Send](./doc/screenshots/screenshot.png) - -## Dokumentasi dan sumber daya - -- Website aplikasi resmi: -- Depot kode aplikasi hulu: -- Gudang YunoHost: -- Laporkan bug: - -## Info developer - -Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/send_ynh/tree/testing). - -Untuk mencoba branch `testing`, silakan dilanjutkan seperti: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -atau -sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -``` - -**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_it.md b/README_it.md deleted file mode 100644 index 4c988af..0000000 --- a/README_it.md +++ /dev/null @@ -1,50 +0,0 @@ - - -# Send per YunoHost - -[![Livello di integrazione](https://dash.yunohost.org/integration/send.svg)](https://dash.yunohost.org/appci/app/send) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg) - -[![Installa Send con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) - -*[Leggi questo README in altre lingue.](./ALL_README.md)* - -> *Questo pacchetto ti permette di installare Send su un server YunoHost in modo semplice e veloce.* -> *Se non hai YunoHost, consulta [la guida](https://yunohost.org/install) per imparare a installarlo.* - -## Panoramica - -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. - - -**Versione pubblicata:** 3.4.23~ynh3 - -**Prova:** - -## Screenshot - -![Screenshot di Send](./doc/screenshots/screenshot.png) - -## Documentazione e risorse - -- Sito web ufficiale dell’app: -- Repository upstream del codice dell’app: -- Store di YunoHost: -- Segnala un problema: - -## Informazioni per sviluppatori - -Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/send_ynh/tree/testing). - -Per provare la branch di `testing`, si prega di procedere in questo modo: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -o -sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -``` - -**Maggiori informazioni riguardo il pacchetto di quest’app:** diff --git a/README_nl.md b/README_nl.md deleted file mode 100644 index 6db9bbb..0000000 --- a/README_nl.md +++ /dev/null @@ -1,50 +0,0 @@ - - -# Send voor Yunohost - -[![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) - -[![Send met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) - -*[Deze README in een andere taal lezen.](./ALL_README.md)* - -> *Met dit pakket kun je Send snel en eenvoudig op een YunoHost-server installeren.* -> *Als je nog geen YunoHost hebt, lees dan [de installatiehandleiding](https://yunohost.org/install), om te zien hoe je 'm installeert.* - -## Overzicht - -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. - - -**Geleverde versie:** 3.4.23~ynh5 - -**Demo:** - -## Schermafdrukken - -![Schermafdrukken van Send](./doc/screenshots/screenshot.png) - -## Documentatie en bronnen - -- Officiele website van de app: -- Upstream app codedepot: -- YunoHost-store: -- Meld een bug: - -## Ontwikkelaarsinformatie - -Stuur je pull request alsjeblieft naar de [`testing`-branch](https://github.com/YunoHost-Apps/send_ynh/tree/testing). - -Om de `testing`-branch uit te proberen, ga als volgt te werk: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -of -sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -``` - -**Verdere informatie over app-packaging:** diff --git a/README_ru.md b/README_ru.md deleted file mode 100644 index 78d45e9..0000000 --- a/README_ru.md +++ /dev/null @@ -1,50 +0,0 @@ - - -# Send для YunoHost - -[![Уровень интеграции](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) - -[![Установите Send с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) - -*[Прочтите этот README на других языках.](./ALL_README.md)* - -> *Этот пакет позволяет Вам установить Send быстро и просто на YunoHost-сервер.* -> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* - -## Обзор - -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. - - -**Поставляемая версия:** 3.4.23~ynh5 - -**Демо-версия:** - -## Снимки экрана - -![Снимок экрана Send](./doc/screenshots/screenshot.png) - -## Документация и ресурсы - -- Официальный веб-сайт приложения: -- Репозиторий кода главной ветки приложения: -- Магазин YunoHost: -- Сообщите об ошибке: - -## Информация для разработчиков - -Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/send_ynh/tree/testing). - -Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -или -sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -``` - -**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md deleted file mode 100644 index 425c230..0000000 --- a/README_zh_Hans.md +++ /dev/null @@ -1,50 +0,0 @@ - - -# YunoHost 上的 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) - -[![使用 YunoHost 安装 Send](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) - -*[阅读此 README 的其它语言版本。](./ALL_README.md)* - -> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Send。* -> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* - -## 概况 - -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. - - -**分发版本：** 3.4.23~ynh5 - -**演示：** - -## 截图 - -![Send 的截图](./doc/screenshots/screenshot.png) - -## 文档与资源 - -- 官方应用网站： -- 上游应用代码库： -- YunoHost 商店： -- 报告 bug： - -## 开发者信息 - -请向 [`testing` 分支](https://github.com/YunoHost-Apps/send_ynh/tree/testing) 发送拉取请求。 - -如要尝试 `testing` 分支，请这样操作： - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -或 -sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug -``` - -**有关应用打包的更多信息：** diff --git a/conf/nginx.conf b/conf/nginx.conf index b7baa04..ada238d 100644 --- a/conf/nginx.conf +++ b/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_set_header Host $host; - 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; + proxy_pass http://127.0.0.1:__PORT__; + include proxy_params_no_auth; } location /api/ws { proxy_pass http://127.0.0.1:__PORT__; - proxy_set_header X-Real-IP $remote_addr; - 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 ""; + include proxy_params_no_auth; proxy_connect_timeout 4000s; proxy_read_timeout 4000s; } diff --git a/manifest.toml b/manifest.toml index e7c7220..77452ed 100644 --- a/manifest.toml +++ b/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~ynh5" +version = "3.5.0~ynh1" maintainers = [] @@ -18,13 +18,12 @@ demo = "https://send.vis.ee/" code = "https://github.com/timvisee/send" [integration] -yunohost = ">= 11.2.30" +yunohost = ">= 12.1.40" 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.23.tar.gz" - sha256 = "eed0e391050842413d300133a64cc76829e3ba1d69e113f6e5fdc3eda777fa2a" + url = "https://github.com/timvisee/send/archive/refs/tags/v3.5.0.tar.gz" + sha256 = "d8e483c0ff1377ed9773dfe888af8b45a68a08769afb1e31eddb32fff79c0190" autoupdate.strategy = "latest_github_tag" [resources.ports] @@ -71,3 +70,6 @@ ram.runtime = "50M" [resources.apt] packages = "redis-server" + + [resources.nodejs] + version = "26" diff --git a/scripts/_common.sh b/scripts/_common.sh deleted file mode 100644 index eaae793..0000000 --- a/scripts/_common.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -#================================================= -# COMMON VARIABLES AND CUSTOM HELPERS -#================================================= - -nodejs_version=16 diff --git a/scripts/backup b/scripts/backup index 50e701d..18e8cc6 100644 --- a/scripts/backup +++ b/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..." diff --git a/scripts/change_url b/scripts/change_url index b851106..f3d01be 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,6 +1,5 @@ #!/bin/bash -source _common.sh source /usr/share/yunohost/helpers #================================================= @@ -8,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 @@ -22,18 +21,14 @@ 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 #================================================= 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 diff --git a/scripts/install b/scripts/install index 056a1a5..463da56 100644 --- a/scripts/install +++ b/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 #================================================= @@ -60,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 diff --git a/scripts/remove b/scripts/remove index f2ae961..f6416b0 100644 --- a/scripts/remove +++ b/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 #================================================= diff --git a/scripts/restore b/scripts/restore index a8a434e..f0abdea 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,6 +1,5 @@ #!/bin/bash -source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= @@ -17,8 +16,6 @@ chmod +x "$install_dir/server/bin/prod.js" #================================================= 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" @@ -31,7 +28,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 diff --git a/scripts/upgrade b/scripts/upgrade index 2aba8b3..d658852 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,6 +1,5 @@ #!/bin/bash -source _common.sh source /usr/share/yunohost/helpers #================================================= @@ -8,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 @@ -26,13 +25,6 @@ ynh_setup_source --dest_dir="$install_dir" --keep="server/config.js" --full_repl chmod +x "$install_dir/server/bin/prod.js" -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression "Upgrading dependencies..." - -ynh_nodejs_install - #================================================= # NGINX CONFIGURATION #================================================= @@ -66,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