YunoHost-Apps/simplex_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/simplex_ynh.git synced 2024-09-03 20:26:28 +02:00
Code Issues Activity Actions

Merge branch 'testing' into config

Browse source
This commit is contained in:
Éric Gaspar 2024-05-08 14:15:06 +02:00
commit 2abcb97c5f
15 changed files with 290 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ALL_README.md Normal file
View file

@ -0,0 +1,7 @@
# All available README files by language
- [Read the README in English](README.md)
- [Irakurri README euskaraz](README_eu.md)
- [Lire le README en français](README_fr.md)
- [Le o README en galego](README_gl.md)
- [阅读中文（简体）的 README](README_zh_Hans.md)

24
README.md
View file

@ -1,5 +1,5 @@
<!-- <!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator N.B.: This README was automatically generated by <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
It shall NOT be edited by hand. It shall NOT be edited by hand.
--> -->
@ -9,16 +9,16 @@ It shall NOT be edited by hand.
[![Install SimpleX with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex) [![Install SimpleX with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex)
*[Lire ce readme en français.](./README_fr.md)* *[Read this README in other languages.](./ALL_README.md)*
> *This package allows you to install SimpleX quickly and simply on a YunoHost server. > *This package allows you to install SimpleX 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.* > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.*
## Overview ## Overview
SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released. SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
**Shipped version:** 5.0.0~ynh2 **Shipped version:** 5.6.2~ynh1
## Screenshots ## Screenshots
@ -26,17 +26,17 @@ SimpleX - the first messaging platform operating without user identifiers of any
## Documentation and resources ## Documentation and resources
* Official app website: <https://simplex.chat/> - Official app website: <https://simplex.chat/>
* Official admin documentation: <https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md> - Official admin documentation: <https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md>
* Upstream app code repository: <https://github.com/simplex-chat/simplex-chat> - Upstream app code repository: <https://github.com/simplex-chat/simplexmq>
* YunoHost documentation for this app: <https://yunohost.org/app_simplex> - YunoHost Store: <https://apps.yunohost.org/app/simplex>
* Report a bug: <https://github.com/YunoHost-Apps/simplex_ynh/issues> - Report a bug: <https://github.com/YunoHost-Apps/simplex_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing). Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing).
To try the testing branch, please proceed like that. To try the `testing` branch, please proceed like that:
```bash ```bash
sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug

47
README_eu.md Normal file
View file

@ -0,0 +1,47 @@
<!--
Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
EZ editatu eskuz.
-->
# SimpleX YunoHost-erako
[![Integrazio maila](https://dash.yunohost.org/integration/simplex.svg)](https://dash.yunohost.org/appci/app/simplex) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/simplex.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/simplex.maintain.svg)
[![Instalatu SimpleX YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex)
*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
> *Pakete honek SimpleX YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*
> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
## Aurreikuspena
SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
**Paketatutako bertsioa:** 5.6.2~ynh1
## Pantaila-argazkiak
![SimpleX(r)en pantaila-argazkia](./doc/screenshots/conversation.png)
## Dokumentazioa eta baliabideak
- Aplikazioaren webgune ofiziala: <https://simplex.chat/>
- Administratzaileen dokumentazio ofiziala: <https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md>
- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/simplex-chat/simplexmq>
- YunoHost Denda: <https://apps.yunohost.org/app/simplex>
- Eman errore baten berri: <https://github.com/YunoHost-Apps/simplex_ynh/issues>
## Garatzaileentzako informazioa
Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing).
`testing` abarra probatzeko, ondorengoa egin:
```bash
sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug
edo
sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug
```
**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

28
README_fr.md
View file

@ -1,6 +1,6 @@
<!-- <!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator Nota bene : ce README est automatiquement généré par <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
It shall NOT be edited by hand. Il NE doit PAS être modifié à la main.
--> -->
# SimpleX pour YunoHost # SimpleX pour YunoHost
@ -9,16 +9,16 @@ It shall NOT be edited by hand.
[![Installer SimpleX avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex) [![Installer SimpleX avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex)
*[Read this readme in english.](./README.md)* *[Lire le README dans d'autres langues.](./ALL_README.md)*
> *Ce package vous permet d’installer SimpleX rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet d’installer SimpleX rapidement et simplement sur un serveur YunoHost.*
Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* > *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.*
## Vue d’ensemble ## Vue d’ensemble
SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'utilisateur d'aucune sorte - 100 % privée de par sa conception ! SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'utilisateur d'aucune sorte - 100 % privée de par sa conception !
**Version incluse :** 5.0.0~ynh2 **Version incluse :** 5.6.2~ynh1
## Captures d’écran ## Captures d’écran
@ -26,17 +26,17 @@ SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'uti
## Documentations et ressources ## Documentations et ressources
* Site officiel de l’app : <https://simplex.chat/> - Site officiel de l’app : <https://simplex.chat/>
* Documentation officielle de l’admin : <https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md> - Documentation officielle de l’admin : <https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md>
* Dépôt de code officiel de l’app : <https://github.com/simplex-chat/simplex-chat> - Dépôt de code officiel de l’app : <https://github.com/simplex-chat/simplexmq>
* Documentation YunoHost pour cette app : <https://yunohost.org/app_simplex> - YunoHost Store : <https://apps.yunohost.org/app/simplex>
* Signaler un bug : <https://github.com/YunoHost-Apps/simplex_ynh/issues> - Signaler un bug : <https://github.com/YunoHost-Apps/simplex_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing). Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit. Pour essayer la branche `testing`, procédez comme suit :
```bash ```bash
sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug
@ -44,4 +44,4 @@ ou
sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug
``` ```
**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps> **Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>

47
README_gl.md Normal file
View file

@ -0,0 +1,47 @@
<!--
NOTA: Este README foi creado automáticamente por <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
NON debe editarse manualmente.
-->
# SimpleX para YunoHost
[![Nivel de integración](https://dash.yunohost.org/integration/simplex.svg)](https://dash.yunohost.org/appci/app/simplex) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/simplex.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/simplex.maintain.svg)
[![Instalar SimpleX con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex)
*[Le este README en outros idiomas.](./ALL_README.md)*
> *Este paquete permíteche instalar SimpleX 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
SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
**Versión proporcionada:** 5.6.2~ynh1
## Capturas de pantalla
![Captura de pantalla de SimpleX](./doc/screenshots/conversation.png)
## Documentación e recursos
- Web oficial da app: <https://simplex.chat/>
- Documentación oficial para admin: <https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md>
- Repositorio de orixe do código: <https://github.com/simplex-chat/simplexmq>
- Tenda YunoHost: <https://apps.yunohost.org/app/simplex>
- Informar dun problema: <https://github.com/YunoHost-Apps/simplex_ynh/issues>
## Info de desenvolvemento
Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing).
Para probar a rama `testing`, procede deste xeito:
```bash
sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug
ou
sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug
```
**Máis info sobre o empaquetado da app:** <https://yunohost.org/packaging_apps>

47
README_it.md Normal file
View file

@ -0,0 +1,47 @@
<!--
N.B.: Questo README è stato automaticamente generato da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
NON DEVE essere modificato manualmente.
-->
# SimpleX per YunoHost
[![Livello di integrazione](https://dash.yunohost.org/integration/simplex.svg)](https://dash.yunohost.org/appci/app/simplex) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/simplex.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/simplex.maintain.svg)
[![Installa SimpleX con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex)
*[Leggi questo README in altre lingue.](./ALL_README.md)*
> *Questo pacchetto ti permette di installare SimpleX 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
SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
**Versione pubblicata:** 5.1.0~ynh2
## Screenshot
![Screenshot di SimpleX](./doc/screenshots/conversation.png)
## Documentazione e risorse
- Sito web ufficiale dell’app: <https://simplex.chat/>
- Documentazione ufficiale per gli amministratori: <https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md>
- Repository upstream del codice dell’app: <https://github.com/simplex-chat/simplexmq>
- Store di YunoHost: <https://apps.yunohost.org/app/simplex>
- Segnala un problema: <https://github.com/YunoHost-Apps/simplex_ynh/issues>
## Informazioni per sviluppatori
Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/simplex_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/simplex_ynh/tree/testing --debug
o
sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug
```
**Maggiori informazioni riguardo il pacchetto di quest’app:** <https://yunohost.org/packaging_apps>

47
README_zh_Hans.md Normal file
View file

@ -0,0 +1,47 @@
<!--
注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
请勿手动编辑。
-->
# YunoHost 的 SimpleX
[![集成程度](https://dash.yunohost.org/integration/simplex.svg)](https://dash.yunohost.org/appci/app/simplex) ![工作状态](https://ci-apps.yunohost.org/ci/badges/simplex.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/simplex.maintain.svg)
[![使用 YunoHost 安装 SimpleX](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex)
*[阅读此 README 的其它语言版本。](./ALL_README.md)*
> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 SimpleX。*
> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
## 概况
SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
**分发版本：** 5.6.2~ynh1
## 截图
![SimpleX 的截图](./doc/screenshots/conversation.png)
## 文档与资源
- 官方应用网站： <https://simplex.chat/>
- 官方管理文档： <https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md>
- 上游应用代码库： <https://github.com/simplex-chat/simplexmq>
- YunoHost 商店： <https://apps.yunohost.org/app/simplex>
- 报告 bug： <https://github.com/YunoHost-Apps/simplex_ynh/issues>
## 开发者信息
请向 [`testing` 分支](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing) 发送拉取请求。
如要尝试 `testing` 分支，请这样操作：
```bash
sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug
或
sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug
```
**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

1
conf/systemd.service
View file

@ -1,5 +1,6 @@
[Unit] [Unit]
Description=SimpleX: Messaging Protocol Server Description=SimpleX: Messaging Protocol Server
Documentation=https://simplex.chat/docs/server.html
After=network.target After=network.target
[Service] [Service]

27
manifest.toml
View file

@ -5,24 +5,27 @@ name = "SimpleX"
description.en = "Messaging platform operating without user identifiers" description.en = "Messaging platform operating without user identifiers"
description.fr = "Plate-forme de messagerie fonctionnant sans identifiants d'utilisateurs" description.fr = "Plate-forme de messagerie fonctionnant sans identifiants d'utilisateurs"
version = "5.0.0~ynh2" version = "5.6.2~ynh1"
maintainers = ["eric_G"] maintainers = []
[upstream] [upstream]
license = "AGPL-3.0" license = "AGPL-3.0"
website = "https://simplex.chat/" website = "https://simplex.chat/"
admindoc = "https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md" admindoc = "https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md"
code = "https://github.com/simplex-chat/simplex-chat" code = "https://github.com/simplex-chat/simplexmq"
cpe = "cpe:2.3:a:simplex:simplex_chat" cpe = "cpe:2.3:a:simplex:simplex_chat"
fund = "https://opencollective.com/simplex-chat" fund = "https://opencollective.com/simplex-chat"
[integration] [integration]
yunohost = ">= 11.1.19" yunohost = ">= 11.2"
architectures = ["amd64", "arm64"] architectures = ["amd64", "arm64"]
multi_instance = false multi_instance = false
ldap = "not_relevant" ldap = "not_relevant"
sso = "not_relevant" sso = "not_relevant"
disk = "50M" disk = "50M"
ram.build = "150M" ram.build = "150M"
ram.runtime = "50M" ram.runtime = "50M"
@ -33,19 +36,19 @@ ram.runtime = "50M"
[resources.sources] [resources.sources]
[resources.sources.main] [resources.sources.main]
amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.0.0.1/smp-server_amd64" amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.6.2/smp-server_amd64"
amd64.sha256 = "fd5c88355496ae09aad7dba582be99307813a18550d870b742c12b8a17f41b71" amd64.sha256 = "d711cc5bddddf4abd01d971d7d4cda879bc4d4d2beb455154031589ffcb0c891"
arm64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.0.0.1/smp-server_arm64" arm64.url = "https://github.com/skyuk3000/simplex_ynh/releases/download/5.2.0/smp-server_arm64"
arm64.sha256 = "b59f26e4ad1a5a8b1e0e6d564c01a713d26c4b01dd6f1e27dea8961df2468002" arm64.sha256 = "2a5a6f34230443212d3166ec7c706440eb2748c6cd2b4e47526a4ccf45717584"
in_subdir = false in_subdir = false
extract = false extract = false
rename = "smp-server" rename = "smp-server"
[resources.sources.xftp] [resources.sources.xftp]
amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.0.0.1/xftp-server_amd64" amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.6.2/xftp-server_amd64"
amd64.sha256 = "24535308621ff9e46d4630fde74cc2f1c8892f1ce1230ce6a538892be64d34f6" amd64.sha256 = "6febc49aa989a02ad8cfc27b657c30acc425878e88a995beca864afeaaff7b3e"
arm64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.0.0.1/xftp-server_arm64" arm64.url = "https://github.com/skyuk3000/simplex_ynh/releases/download/5.2.0/xftp-server_arm64"
arm64.sha256 = "e48e2a57e1992616e33be2b1bda564a978f8bdef3a5e30dce55712bc66278348" arm64.sha256 = "a8f4118610efca9bd7b2d687c04f95a9cf52114d1941c8f94441d80c1c04d92a"
in_subdir = false in_subdir = false
extract = false extract = false
rename = "xftp-server" rename = "xftp-server"

9
scripts/backup
View file

@ -21,11 +21,10 @@ ynh_print_info --message="Declaring files to be backed up..."
ynh_backup --src_path="$install_dir" ynh_backup --src_path="$install_dir"
ynh_secure_remove --file="/etc/opt/simplex" ynh_backup --src_path="/etc/opt/simplex"
ynh_secure_remove --file="/etc/opt/simplex-xftp" ynh_backup --src_path="/etc/opt/simplex-xftp"
ynh_backup --src_path="/var/opt/simplex"
ynh_secure_remove --file="/var/opt/simplex" ynh_backup --src_path="/var/opt/simplex-xftp"
ynh_secure_remove --file="/var/opt/simplex-xftp"
#================================================= #=================================================
# BACKUP SYSTEMD # BACKUP SYSTEMD

8
scripts/install
View file

@ -25,8 +25,8 @@ ynh_script_progression --message="Setting up source files..." --weight=1
ynh_setup_source --dest_dir="$install_dir" ynh_setup_source --dest_dir="$install_dir"
ynh_setup_source --dest_dir="$install_dir" --source_id="xftp" ynh_setup_source --dest_dir="$install_dir" --source_id="xftp"
mkdir -p /var/opt/simplex-xftp /var/opt/simplex /etc/opt/simplex-xftp /etc/opt/simplex mkdir -p /etc/opt/simplex-xftp /etc/opt/simplex /var/opt/simplex-xftp /var/opt/simplex
chown -R $app:$app /var/opt/simplex-xftp /var/opt/simplex /etc/opt/simplex-xftp /etc/opt/simplex chown -R $app:$app /etc/opt/simplex-xftp /etc/opt/simplex /var/opt/simplex-xftp /var/opt/simplex
chmod -R o-rwx "$install_dir" chmod -R o-rwx "$install_dir"
chown -R $app:$app "$install_dir" chown -R $app:$app "$install_dir"
@ -84,8 +84,8 @@ yunohost service add xftp --description="Messaging platform" --log="/var/log/$ap
ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_script_progression --message="Starting a systemd service..." --weight=1
# Start a systemd service # Start a systemd service
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
ynh_systemd_action --service_name="xftp" --action="start" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name="xftp" --action="start" --log_path="systemd"
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT

1
scripts/remove
View file

@ -37,7 +37,6 @@ ynh_remove_systemd_config --service=xftp
# Remove the app directory securely # Remove the app directory securely
ynh_secure_remove --file="/etc/opt/simplex" ynh_secure_remove --file="/etc/opt/simplex"
ynh_secure_remove --file="/etc/opt/simplex-xftp" ynh_secure_remove --file="/etc/opt/simplex-xftp"
ynh_secure_remove --file="/var/opt/simplex" ynh_secure_remove --file="/var/opt/simplex"
ynh_secure_remove --file="/var/opt/simplex-xftp" ynh_secure_remove --file="/var/opt/simplex-xftp"

4
scripts/restore
View file

@ -58,8 +58,8 @@ yunohost service add xftp --description="Messaging platform" --log="/var/log/$ap
#================================================= #=================================================
ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_script_progression --message="Starting a systemd service..." --weight=1
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
ynh_systemd_action --service_name=xftp --action="start" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name=xftp --action="start" --log_path="systemd"
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT

63
scripts/upgrade
View file

@ -9,23 +9,6 @@
source _common.sh source _common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#=================================================
# CHECK VERSION
#=================================================
upgrade_type=$(ynh_check_app_version_changed)
#=================================================
# STORE SETTINGS
#=================================================
public_ip4="$(curl -s ip.yunohost.org)" || true
fingerprint=$(cat /etc/opt/simplex/fingerprint)
xftp_fingerprint=$(cat /etc/opt/simplex-xftp/fingerprint)
ynh_app_setting_set --app=$app --key=public_ip4 --value=$public_ip4
ynh_app_setting_set --app=$app --key=fingerprint --value=$fingerprint
ynh_app_setting_set --app=$app --key=xftp_fingerprint --value=$xftp_fingerprint
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
#================================================= #=================================================
@ -33,8 +16,8 @@ ynh_app_setting_set --app=$app --key=xftp_fingerprint --value=$xftp_fingerprint
#================================================= #=================================================
ynh_script_progression --message="Stopping a systemd service..." --weight=1 ynh_script_progression --message="Stopping a systemd service..." --weight=1
ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
ynh_systemd_action --service_name=xftp --action="stop" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name=xftp --action="stop" --log_path="systemd"
#================================================= #=================================================
# ENSURE DOWNWARD COMPATIBILITY # ENSURE DOWNWARD COMPATIBILITY
@ -49,33 +32,49 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
#================================================= #=================================================
if [ "$upgrade_type" == "UPGRADE_APP" ]
then
ynh_script_progression --message="Upgrading source files..." --weight=1 ynh_script_progression --message="Upgrading source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir" ynh_setup_source --dest_dir="$install_dir"
ynh_setup_source --dest_dir="$install_dir" --source_id="xftp" ynh_setup_source --dest_dir="$install_dir" --source_id="xftp"
fi
mkdir -p /var/opt/simplex-xftp /etc/opt/simplex-xftp
chown -R $app:$app /var/opt/simplex-xftp /etc/opt/simplex-xftp
chmod -R o-rwx "$install_dir" chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir" chown -R $app:www-data "$install_dir"
chmod +x $install_dir/smp-server chmod +x $install_dir/smp-server
chmod +x $install_dir/xftp-server chmod +x $install_dir/xftp-server
#=================================================
# SPECIFIC SETUP
#=================================================
if [ ! -d /etc/opt/simplex-xftp ]; then
mkdir -p "/etc/opt/simplex-xftp"
public_ip4="$(curl -s ip.yunohost.org)" || true
ynh_app_setting_set --app=$app --key=public_ip4 --value=$public_ip4
pushd "$install_dir"
./xftp-server init --ip $public_ip4 --quota '20gb' --store-log --path $data_dir
popd
xftp_fingerprint=$(cat /etc/opt/simplex-xftp/fingerprint)
ynh_app_setting_set --app=$app --key=xftp_fingerprint --value=$xftp_fingerprint
ynh_replace_string --match_string="port: 443" --replace_string="port: $port_xftp" --target_file="/etc/opt/simplex-xftp/file-server.ini"
chown -R $app:$app /etc/opt/simplex-xftp /var/opt/simplex-xftp
fi
#================================================= #=================================================
# ADD A CONFIGURATION # ADD A CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Adding a configuration file..." --weight=1 #ynh_script_progression --message="Adding a configuration file..." --weight=1
ynh_add_config --template="../conf/file-server.ini" --destination="/etc/opt/simplex-xftp/file-server.ini" #ynh_add_config --template="file-server.ini" --destination="/etc/opt/simplex-xftp/file-server.ini"
chmod 400 "/etc/opt/simplex-xftp/file-server.ini" #chmod 400 "/etc/opt/simplex-xftp/file-server.ini"
chown $app:$app "/etc/opt/simplex-xftp/file-server.ini" #chown $app:$app "/etc/opt/simplex-xftp/file-server.ini"
#================================================= #=================================================
# REAPPLY SYSTEM CONFIGURATIONS # REAPPLY SYSTEM CONFIGURATIONS
@ -94,8 +93,8 @@ yunohost service add xftp --description="Messaging platform" --log="/var/log/$ap
#================================================= #=================================================
ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_script_progression --message="Starting a systemd service..." --weight=1
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
ynh_systemd_action --service_name=xftp --action="start" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name=xftp --action="start" --log_path="systemd"
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT

6
tests.toml
View file

@ -7,3 +7,9 @@ test_format = 1.0
# ------------ # ------------
exclude = ["change_url"] exclude = ["change_url"]
# -------------------------------
# Commits to test upgrade from
# -------------------------------
test_upgrade_from.5f452d7acda69f4897ce1344678d0f59ccb162ca.name = "Upgrade from 5.0.0~ynh2"