diff --git a/ALL_README.md b/ALL_README.md
deleted file mode 100644
index c93d620..0000000
--- a/ALL_README.md
+++ /dev/null
@@ -1,12 +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)
-- [Przeczytaj README w języku polski](README_pl.md)
-- [Прочитать README на русский](README_ru.md)
-- [阅读中文(简体)的 README](README_zh_Hans.md)
diff --git a/README.md b/README.md
index 4ab7e5c..b5a5bc3 100644
--- a/README.md
+++ b/README.md
@@ -1,50 +1,44 @@
-# PufferPanel for YunoHost
+
+
+ PufferPanel, packaged for YunoHost
+
-[](https://ci-apps.yunohost.org/ci/apps/pufferpanel/)
-
-
+Web-based Game Server Management System
-[](https://install-app.yunohost.org/?app=pufferpanel)
+[](https://www.pufferpanel.com/)
+[?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/pufferpanel/)
-*[Read this README in other languages.](./ALL_README.md)*
+
+

+

+
-> *This package allows you to install PufferPanel 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
-
-PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers.
-
-
-**Shipped version:** 2.7.1~ynh1
## Screenshots
-

-## Documentation and resources
+## 📦 Developer info
-- Official app website:
-- Official admin documentation:
-- Upstream app code repository:
-- YunoHost Store:
-- Report a bug:
+[](https://ci-apps.yunohost.org/ci/apps/pufferpanel/)
-## Developer info
+🛠️ Upstream PufferPanel repository:
-Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing).
+Pull request are welcome and should target the [`testing` branch](https://github.com/YunoHost-Apps/pufferpanel_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/pufferpanel_ynh/tree/testing
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-or
-sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
+# upgrade an existing install:
+sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_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 594ad09..0000000
--- a/README_es.md
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-# PufferPanel para Yunohost
-
-[](https://ci-apps.yunohost.org/ci/apps/pufferpanel/)
-
-
-
-[](https://install-app.yunohost.org/?app=pufferpanel)
-
-*[Leer este README en otros idiomas.](./ALL_README.md)*
-
-> *Este paquete le permite instalarPufferPanel 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
-
-PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers.
-
-
-**Versión actual:** 2.7.1~ynh1
-
-## Capturas
-
-
-
-## Documentaciones y recursos
-
-- Sitio web oficial:
-- Documentación administrador 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/pufferpanel_ynh/tree/testing).
-
-Para probar la rama `testing`, sigue asÍ:
-
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-o
-sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_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 6519f66..0000000
--- a/README_eu.md
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-# PufferPanel YunoHost-erako
-
-[](https://ci-apps.yunohost.org/ci/apps/pufferpanel/)
-
-
-
-[](https://install-app.yunohost.org/?app=pufferpanel)
-
-*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
-
-> *Pakete honek PufferPanel YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*
-> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
-
-## Aurreikuspena
-
-PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers.
-
-
-**Paketatutako bertsioa:** 2.7.1~ynh1
-
-## Pantaila-argazkiak
-
-
-
-## Dokumentazioa eta baliabideak
-
-- Aplikazioaren webgune ofiziala:
-- Administratzaileen dokumentazio ofiziala:
-- Jatorrizko aplikazioaren kode-gordailua:
-- YunoHost Denda:
-- Eman errore baten berri:
-
-## Garatzaileentzako informazioa
-
-Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing).
-
-`testing` abarra probatzeko, ondorengoa egin:
-
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-edo
-sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-```
-
-**Informazio gehiago aplikazioaren paketatzeari buruz:**
diff --git a/README_fr.md b/README_fr.md
deleted file mode 100644
index 8d0d8d7..0000000
--- a/README_fr.md
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-# PufferPanel pour YunoHost
-
-[](https://ci-apps.yunohost.org/ci/apps/pufferpanel/)
-
-
-
-[](https://install-app.yunohost.org/?app=pufferpanel)
-
-*[Lire le README dans d'autres langues.](./ALL_README.md)*
-
-> *Ce package vous permet d’installer PufferPanel 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
-
-PufferPanel est un système de gestion de serveur de jeu basé sur le Web créé par des joueurs pour des joueurs. PufferPanel vous permet d'exécuter plusieurs serveurs de jeu différents à partir d'un emplacement central et de donner aux autres utilisateurs leurs propres serveurs ou un accès à vos propres serveurs.
-
-
-**Version incluse :** 2.7.1~ynh1
-
-## Captures d’écran
-
-
-
-## Documentations et ressources
-
-- Site officiel de l’app :
-- Documentation officielle de l’admin :
-- 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/pufferpanel_ynh/tree/testing).
-
-Pour essayer la branche `testing`, procédez comme suit :
-
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-ou
-sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_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 f12023c..0000000
--- a/README_gl.md
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-# PufferPanel para YunoHost
-
-[](https://ci-apps.yunohost.org/ci/apps/pufferpanel/)
-
-
-
-[](https://install-app.yunohost.org/?app=pufferpanel)
-
-*[Le este README en outros idiomas.](./ALL_README.md)*
-
-> *Este paquete permíteche instalar PufferPanel 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
-
-PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers.
-
-
-**Versión proporcionada:** 2.7.1~ynh1
-
-## Capturas de pantalla
-
-
-
-## Documentación e recursos
-
-- Web oficial da app:
-- Documentación oficial para admin:
-- 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/pufferpanel_ynh/tree/testing).
-
-Para probar a rama `testing`, procede deste xeito:
-
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-ou
-sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_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 4f44405..0000000
--- a/README_id.md
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-# PufferPanel untuk YunoHost
-
-[](https://ci-apps.yunohost.org/ci/apps/pufferpanel/)
-
-
-
-[](https://install-app.yunohost.org/?app=pufferpanel)
-
-*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
-
-> *Paket ini memperbolehkan Anda untuk memasang PufferPanel 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
-
-PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers.
-
-
-**Versi terkirim:** 2.7.1~ynh1
-
-## Tangkapan Layar
-
-
-
-## Dokumentasi dan sumber daya
-
-- Website aplikasi resmi:
-- Dokumentasi admin resmi:
-- Depot kode aplikasi hulu:
-- Gudang YunoHost:
-- Laporkan bug:
-
-## Info developer
-
-Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing).
-
-Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
-
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-atau
-sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_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 9052572..0000000
--- a/README_it.md
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-# PufferPanel per YunoHost
-
-[](https://dash.yunohost.org/appci/app/pufferpanel)  
-
-[](https://install-app.yunohost.org/?app=pufferpanel)
-
-*[Leggi questo README in altre lingue.](./ALL_README.md)*
-
-> *Questo pacchetto ti permette di installare PufferPanel 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
-
-PufferPanel is an open source game server management panel designed to be easy to use and easy to install. PufferPanel supports Minecraft, Forge, Spigot, Sponge, Source Dedicated Servers, BungeeCord, PocketMine, Forge, and much more.
-
-**Versione pubblicata:** 2.6.9~ynh2
-
-## Screenshot
-
-
-
-## Documentazione e risorse
-
-- Sito web ufficiale dell’app:
-- Documentazione ufficiale per gli amministratori:
-- 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/pufferpanel_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/pufferpanel_ynh/tree/testing --debug
-o
-sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_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 7392b09..0000000
--- a/README_nl.md
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-# PufferPanel voor Yunohost
-
-[](https://ci-apps.yunohost.org/ci/apps/pufferpanel/)
-
-
-
-[](https://install-app.yunohost.org/?app=pufferpanel)
-
-*[Deze README in een andere taal lezen.](./ALL_README.md)*
-
-> *Met dit pakket kun je PufferPanel 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
-
-PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers.
-
-
-**Geleverde versie:** 2.7.1~ynh1
-
-## Schermafdrukken
-
-
-
-## Documentatie en bronnen
-
-- Officiele website van de app:
-- Officiele beheerdersdocumentatie:
-- Upstream app codedepot:
-- YunoHost-store:
-- Meld een bug:
-
-## Ontwikkelaarsinformatie
-
-Stuur je pull request alsjeblieft naar de [`testing`-branch](https://github.com/YunoHost-Apps/pufferpanel_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/pufferpanel_ynh/tree/testing --debug
-of
-sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-```
-
-**Verdere informatie over app-packaging:**
diff --git a/README_pl.md b/README_pl.md
deleted file mode 100644
index 7c90e97..0000000
--- a/README_pl.md
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-# PufferPanel dla YunoHost
-
-[](https://ci-apps.yunohost.org/ci/apps/pufferpanel/)
-
-
-
-[](https://install-app.yunohost.org/?app=pufferpanel)
-
-*[Przeczytaj plik README w innym języku.](./ALL_README.md)*
-
-> *Ta aplikacja pozwala na szybką i prostą instalację PufferPanel na serwerze YunoHost.*
-> *Jeżeli nie masz YunoHost zapoznaj się z [poradnikiem](https://yunohost.org/install) instalacji.*
-
-## Przegląd
-
-PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers.
-
-
-**Dostarczona wersja:** 2.7.1~ynh1
-
-## Zrzuty ekranu
-
-
-
-## Dokumentacja i zasoby
-
-- Oficjalna strona aplikacji:
-- Oficjalna dokumentacja dla administratora:
-- Repozytorium z kodem źródłowym:
-- Sklep YunoHost:
-- Zgłaszanie błędów:
-
-## Informacje od twórców
-
-Wyślij swój pull request do [gałęzi `testing`](https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing).
-
-Aby wypróbować gałąź `testing` postępuj zgodnie z instrukcjami:
-
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-lub
-sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-```
-
-**Więcej informacji o tworzeniu paczek aplikacji:**
diff --git a/README_ru.md b/README_ru.md
deleted file mode 100644
index aad23f2..0000000
--- a/README_ru.md
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-# PufferPanel для YunoHost
-
-[](https://ci-apps.yunohost.org/ci/apps/pufferpanel/)
-
-
-
-[](https://install-app.yunohost.org/?app=pufferpanel)
-
-*[Прочтите этот README на других языках.](./ALL_README.md)*
-
-> *Этот пакет позволяет Вам установить PufferPanel быстро и просто на YunoHost-сервер.*
-> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
-
-## Обзор
-
-PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers.
-
-
-**Поставляемая версия:** 2.7.1~ynh1
-
-## Снимки экрана
-
-
-
-## Документация и ресурсы
-
-- Официальный веб-сайт приложения:
-- Официальная документация администратора:
-- Репозиторий кода главной ветки приложения:
-- Магазин YunoHost:
-- Сообщите об ошибке:
-
-## Информация для разработчиков
-
-Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing).
-
-Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
-
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-или
-sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-```
-
-**Больше информации о пакетировании приложений:**
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
deleted file mode 100644
index b7c905a..0000000
--- a/README_zh_Hans.md
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-# YunoHost 上的 PufferPanel
-
-[](https://ci-apps.yunohost.org/ci/apps/pufferpanel/)
-
-
-
-[](https://install-app.yunohost.org/?app=pufferpanel)
-
-*[阅读此 README 的其它语言版本。](./ALL_README.md)*
-
-> *通过此软件包,您可以在 YunoHost 服务器上快速、简单地安装 PufferPanel。*
-> *如果您还没有 YunoHost,请参阅[指南](https://yunohost.org/install)了解如何安装它。*
-
-## 概况
-
-PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers.
-
-
-**分发版本:** 2.7.1~ynh1
-
-## 截图
-
-
-
-## 文档与资源
-
-- 官方应用网站:
-- 官方管理文档:
-- 上游应用代码库:
-- YunoHost 商店:
-- 报告 bug:
-
-## 开发者信息
-
-请向 [`testing` 分支](https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing) 发送拉取请求。
-
-如要尝试 `testing` 分支,请这样操作:
-
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-或
-sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug
-```
-
-**有关应用打包的更多信息:**
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
new file mode 100644
index 0000000..c1986c4
--- /dev/null
+++ b/doc/ADMIN_fr.md
@@ -0,0 +1 @@
+Les fichiers du serveur de jeu sont stockés dans `__DATA_DIR__`
diff --git a/manifest.toml b/manifest.toml
index b749b18..9e00bef 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -18,12 +18,12 @@ admindoc = "https://docs.pufferpanel.com/en/latest/"
code = "https://github.com/PufferPanel/PufferPanel"
[integration]
-yunohost = ">= 11.2"
+yunohost = ">= 12.1.17"
+helpers_version = "2.1"
architectures = "all"
multi_instance = false
ldap = false
-
sso = false
disk = "50M"
@@ -46,7 +46,6 @@ ram.runtime = "50M"
[install.password]
type = "password"
-
[resources]
[resources.system_user]
diff --git a/scripts/_common.sh b/scripts/_common.sh
deleted file mode 100644
index 0f1a117..0000000
--- a/scripts/_common.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-#=================================================
-# COMMON VARIABLES
-#=================================================
-
-main_domain=$(cat /etc/yunohost/current_host)
-
-#=================================================
-# PERSONAL HELPERS
-#=================================================
-
-#=================================================
-# EXPERIMENTAL HELPERS
-#=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
-#=================================================
diff --git a/scripts/backup b/scripts/backup
index b887886..56e9fb9 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -1,53 +1,38 @@
#!/bin/bash
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
-source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers
-#=================================================
-# DECLARE DATA AND CONF FILES TO BACKUP
-#=================================================
-ynh_print_info --message="Declaring files to be backed up..."
+ynh_print_info "Declaring files to be backed up..."
#=================================================
# BACKUP THE APP MAIN DIR
#=================================================
-ynh_backup --src_path="$install_dir"
+ynh_backup "$install_dir"
#=================================================
# BACKUP THE DATA DIR
#=================================================
-ynh_backup --src_path="$data_dir" --is_big
+ynh_backup "$data_dir"
#=================================================
# BACKUP THE NGINX CONFIGURATION
#=================================================
-ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
-#=================================================
-# BACKUP VARIOUS FILES
-#=================================================
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
-ynh_backup --src_path="/etc/$app/"
+ynh_backup "/etc/$app/"
#=================================================
# BACKUP THE POSTGRESQL DATABASE
#=================================================
-ynh_print_info --message="Backing up the PostgreSQL database..."
+ynh_print_info "Backing up the PostgreSQL database..."
-ynh_psql_dump_db --database="$db_name" > db.sql
+ynh_psql_dump_db > db.sql
#=================================================
# END OF SCRIPT
#=================================================
-ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
+ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
diff --git a/scripts/change_url b/scripts/change_url
index e84a828..b50d9a6 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -1,42 +1,30 @@
#!/bin/bash
-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-source _common.sh
source /usr/share/yunohost/helpers
-#=================================================
-# STANDARD MODIFICATIONS
#=================================================
# STOP SYSTEMD SERVICE
#=================================================
-ynh_script_progression --message="Stopping a systemd service..."
+ynh_script_progression "Stopping $app's systemd service..."
-ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd"
+ynh_systemctl --service="$app" --action="stop"
#=================================================
# MODIFY URL IN NGINX CONF
#=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..."
+ynh_script_progression "Updating NGINX web server configuration..."
-ynh_change_url_nginx_config
+ynh_config_change_url_nginx
-#=================================================
-# GENERIC FINALISATION
#=================================================
# START SYSTEMD SERVICE
#=================================================
-ynh_script_progression --message="Starting a systemd service..."
+ynh_script_progression "Starting $app's systemd service..."
-# Start a systemd service
-ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --line_match="Listening for"
+ynh_systemctl --service="$app" --action="start"
#=================================================
# END OF SCRIPT
#=================================================
-ynh_script_progression --message="Change of URL completed for $app"
+ynh_script_progression "Change of URL completed for $app"
diff --git a/scripts/install b/scripts/install
index 9a2cce8..e0ff682 100644
--- a/scripts/install
+++ b/scripts/install
@@ -1,12 +1,5 @@
#!/bin/bash
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-source _common.sh
source /usr/share/yunohost/helpers
#=================================================
@@ -14,62 +7,48 @@ source /usr/share/yunohost/helpers
#=================================================
email=$(ynh_user_get_info --username="$admin" --key=mail)
+main_domain=$(cat /etc/yunohost/current_host)
#=================================================
# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
#=================================================
-ynh_script_progression --message="Validating installation parameters..."
+ynh_script_progression "Validating installation parameters..."
if [[ ${#admin} -lt 5 ]]; then
- ynh_die --message="Admin username minimum length is 5"
+ ynh_die "Admin username minimum length is 5"
fi
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-
-chmod 750 "$install_dir"
-chmod -R o-rwx "$install_dir"
-chown -R "$app:www-data" "$install_dir"
-
#=================================================
# NGINX CONFIGURATION
#=================================================
-ynh_script_progression --message="Configuring NGINX web server..."
+ynh_script_progression "Configuring NGINX web server..."
-# Create a dedicated NGINX config
-ynh_add_nginx_config
+ynh_config_add_nginx
systemctl enable "$app.service" --quiet
yunohost service add "$app" --description="Web-based Game Server Management System" --log="/var/log/$app/$app.log"
-#=================================================
-# SPECIFIC SETUP
#=================================================
# ADD A CONFIGURATION
#=================================================
-ynh_script_progression --message="Adding a configuration file..."
+ynh_script_progression "Adding $app's configuration..."
-ynh_add_config --template="config.json" --destination="/etc/$app/config.json"
+ynh_config_add --template="config.json" --destination="/etc/$app/config.json"
chmod 650 "/etc/$app/config.json"
-chown "$app:$app" "/etc/$app/config.json"
pufferpanel user add --admin --email="$email" --name="$admin" --password="$password"
-#=================================================
-# GENERIC FINALIZATION
#=================================================
# START SYSTEMD SERVICE
#=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
+ynh_script_progression "Starting $app's systemd service..."
-# Start a systemd service
-ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --line_match="Listening for"
+ynh_systemctl --service="$app" --action="start"
#=================================================
# END OF SCRIPT
#=================================================
-ynh_script_progression --message="Installation of $app completed"
+ynh_script_progression "Installation of $app completed"
diff --git a/scripts/remove b/scripts/remove
index 17e1e31..5befe8f 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,36 +1,22 @@
#!/bin/bash
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-source _common.sh
source /usr/share/yunohost/helpers
#=================================================
-# STANDARD REMOVE
-#=================================================
-# REMOVE SERVICE INTEGRATION IN YUNOHOST
+# REMOVE SYSTEM CONFIGURATIONS
#=================================================
+ynh_script_progression "Removing system configurations related to $app..."
-# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
-if ynh_exec_warn_less yunohost service status "$app" >/dev/null
-then
- ynh_script_progression --message="Removing $app service integration..."
+if ynh_hide_warnings yunohost service status "$app" >/dev/null; then
yunohost service remove "$app"
fi
-# Remove the dedicated NGINX config
-ynh_remove_nginx_config
+ynh_config_remove_nginx
-ynh_secure_remove "/etc/$app/"
+ynh_safe_rm "/etc/$app/"
-#=================================================
-# GENERIC FINALIZATION
#=================================================
# END OF SCRIPT
#=================================================
-ynh_script_progression --message="Removal of $app completed"
+ynh_script_progression "Removal of $app completed"
diff --git a/scripts/restore b/scripts/restore
index 76ac086..066e4e4 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -1,68 +1,52 @@
#!/bin/bash
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
-source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers
-
#=================================================
# RESTORE THE APP MAIN DIR
#=================================================
-ynh_script_progression --message="Restoring the app main directory..." --weight=1
-
-ynh_restore_file --origin_path="$install_dir"
+ynh_script_progression "Restoring the app main directory..."
-chmod -R o-rwx "$install_dir"
-chown -R "$app:www-data" "$install_dir"
+ynh_restore "$install_dir"
#=================================================
-# RESTORE THE POSTGRESQL DATABASE
+# RESTORE THE DATA DIRECTORY
#=================================================
-ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=6
+ynh_script_progression "Restoring the data directory..."
-ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name"
+ynh_restore "$data_dir"
#=================================================
-# RESTORE THE DATA DIRECTORY
+# RESTORE THE POSTGRESQL DATABASE
#=================================================
-ynh_script_progression --message="Restoring the data directory..." --weight=1
-
-ynh_restore_file --origin_path="$data_dir" --not_mandatory
+ynh_script_progression "Restoring the PostgreSQL database..."
-chown -R "$app:www-data" "$data_dir"
+ynh_psql_db_shell < ./db.sql
#=================================================
# RESTORE VARIOUS FILES
#=================================================
-ynh_script_progression --message="Restoring various files..."
+ynh_script_progression "Restoring various files..."
-ynh_restore_file --origin_path="/etc/$app/"
+ynh_restore "/etc/$app/"
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf"
systemctl enable "$app.service" --quiet
yunohost service add "$app" --description="Web-based Game Server Management System" --log="/var/log/$app/$app.log"
-#=================================================
-# GENERIC FINALIZATION
#=================================================
# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
#=================================================
-ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
+ynh_script_progression "Reloading NGINX web server and $app's service..."
-ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --line_match="Listening for"
+ynh_systemctl --service="$app" --action="start"
-ynh_systemd_action --service_name=nginx --action=reload
+ynh_systemctl --service=nginx --action=reload
#=================================================
# END OF SCRIPT
#=================================================
-ynh_script_progression --message="Restoration completed for $app"
+ynh_script_progression "Restoration completed for $app"
diff --git a/scripts/upgrade b/scripts/upgrade
index 9055e95..4f6be40 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -1,12 +1,5 @@
#!/bin/bash
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-source _common.sh
source /usr/share/yunohost/helpers
#=================================================
@@ -14,48 +7,32 @@ source /usr/share/yunohost/helpers
#=================================================
email=$(ynh_user_get_info --username="$admin" --key=mail)
+main_domain=$(cat /etc/yunohost/current_host)
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
-#=================================================
-# STANDARD UPGRADE STEPS
#=================================================
# STOP SYSTEMD SERVICE
#=================================================
-ynh_script_progression --message="Stopping a systemd service..."
+ynh_script_progression "Stopping $app's systemd service..."
-ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd"
+ynh_systemctl --service="$app" --action="stop"
#=================================================
# ENSURE DOWNWARD COMPATIBILITY
#=================================================
-ynh_script_progression --message="Ensuring downward compatibility..."
+ynh_script_progression "Ensuring downward compatibility..."
# moving the data folder to the standard ynh one
if [ -d "/var/lib/$app" ]; then
- ynh_print_info --message="Moving the data folder from '/var/lib/$app' to '$data_dir'"
+ ynh_print_info "Moving the data folder from '/var/lib/$app' to '$data_dir'"
mv "/var/lib/$app" "$data_dir"
fi
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-
-chmod 750 "$install_dir"
-chmod -R o-rwx "$install_dir"
-chown -R "$app:www-data" "$install_dir"
-
#=================================================
# REAPPLY SYSTEM CONFIGURATIONS
#=================================================
-ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
+ynh_script_progression "Upgrading system configurations related to $app..."
-# Create a dedicated NGINX config
-ynh_add_nginx_config
+ynh_config_add_nginx
systemctl enable "$app.service" --quiet
@@ -64,22 +41,20 @@ yunohost service add "$app" --description="Web-based Game Server Management Syst
#=================================================
# UPDATE A CONFIG FILE
#=================================================
-#ynh_script_progression --message="Updating a configuration file..."
-
-#ynh_add_config --template="config.json" --destination="/etc/$app/config.json"
+ynh_script_progression "Updating configuration..."
-#chmod 650 "/etc/$app/config.json"
-#chown "$app:$app" "/etc/$app/config.json"
+ynh_config_add --template="config.json" --destination="/etc/$app/config.json"
+chmod 650 "/etc/$app/config.json"
#=================================================
# START SYSTEMD SERVICE
#=================================================
-ynh_script_progression --message="Starting a systemd service..."
+ynh_script_progression "Starting $app's systemd service..."
-ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --line_match="Listening for"
+ynh_systemctl --service="$app" --action="start"
#=================================================
# END OF SCRIPT
#=================================================
-ynh_script_progression --message="Upgrade of $app completed"
+ynh_script_progression "Upgrade of $app completed"
diff --git a/tests.toml b/tests.toml
index 89f6379..6a96341 100644
--- a/tests.toml
+++ b/tests.toml
@@ -7,15 +7,5 @@ test_format = 1.0
# ------------
# Tests to run
# ------------
-
- # -------------------------------
- # Default args to use for install
- # -------------------------------
-
- arg.password = "password1234"
-
- # -------------------------------
- # Commits to test upgrade from
- # -------------------------------
-
- # test_upgrade_from.5a4a4ca05f2100d37b87893bd8f6c6eb7341dc50.name = "Upgrade from 2.6.9~ynh2"
+
+ args.password = "password1234"