From aa6fd852f1d48de8106c62ff2488b5af34c1f2bb Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 26 Nov 2017 17:55:20 +0100 Subject: [PATCH 1/3] Readme fr --- README.md | 2 ++ README_fr.md | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 README_fr.md diff --git a/README.md b/README.md index db6837f..d86f007 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ [![Integration level](https://dash.yunohost.org/integration/pihole.svg)](https://ci-apps.yunohost.org/jenkins/job/pihole%20%28Community%29/lastBuild/consoleFull) [![Install Pi-hole with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=pihole +*[Lire ce readme en français.](./README_fr.md)* + > *This package allow you to install Pi-hole quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..b929d15 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,64 @@ +# Pi-hole pour YunoHost + +[![Niveau d'intégration](https://dash.yunohost.org/integration/pihole.svg)](https://ci-apps.yunohost.org/jenkins/job/pihole%20%28Community%29/lastBuild/consoleFull) +[![Installer Pi-hole avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=pihole + +*[Read this readme in english.](./README.md)* + +> *Ce package vous permet d'installer Pi-hole rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/install_fr) pour savoir comment l'installer et en profiter.* + +## Résumé +Blocage des publicités sur l'ensemble du réseau via votre propre matériel Linux + +**Version embarquée:** 3.1.4 + +## Captures d'écran + +![](https://i0.wp.com/pi-hole.net/wp-content/uploads/2016/12/dashboard212.png) + +## Configuration + +Utiliser le panneau d'administration de votre Pi-hole pour configurer cette application. + +## Documentation + +* Documentation officielle: Impossible à trouver +* Pi-hole en tant que serveur DHCP: [dhcp.md](./dhcp.md) +* Documentation YunoHost: Il n'y a pas d'autre documentation, n'hésitez pas à contribuer. + +## Fonctionnalités spécifiques à YunoHost + +* Accès privé au panneau d'administration. + +#### Support multi-utilisateurs + +#### Architectures supportées. + +* Testé sur x86_64 + +## Limitations + +* Activer DHCP avec Pi-hole nécessite une configuration manuelle de votre routeur. + +## Informations additionnelles + +## Liens + + * Reporter un bug: https://github.com/YunoHost-Apps/pihole_ynh/issues + * Site de Pi-hole: https://pi-hole.net/ + * Site de YunoHost: https://yunohost.org/ + +--- + +Informations à l'intention des développeurs +---------------- + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/pihole_ynh/tree/testing). + +Pour tester la branche testing, merci de procéder ainsi. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/pihole_ynh/tree/testing --verbose +ou +sudo yunohost app upgrade pihole -u https://github.com/YunoHost-Apps/pihole_ynh/tree/testing --verbose +``` From aa1a3dd06042bad04d0e20f038118036c5a2d5ac Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 26 Nov 2017 17:59:27 +0100 Subject: [PATCH 2/3] Typo fix --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d86f007..56f66cc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Pi-hole for YunoHost [![Integration level](https://dash.yunohost.org/integration/pihole.svg)](https://ci-apps.yunohost.org/jenkins/job/pihole%20%28Community%29/lastBuild/consoleFull) -[![Install Pi-hole with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=pihole +[![Install Pi-hole with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=pihole) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index b929d15..1754ee1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Pi-hole pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/pihole.svg)](https://ci-apps.yunohost.org/jenkins/job/pihole%20%28Community%29/lastBuild/consoleFull) -[![Installer Pi-hole avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=pihole +[![Installer Pi-hole avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=pihole) *[Read this readme in english.](./README.md)* From 9123b4c586a68998af2139d2cdc02d6f33e2296f Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 1 Dec 2017 21:32:32 +0100 Subject: [PATCH 3/3] Fix change url --- scripts/change_url | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 4d6b6ae..2c074dd 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -47,20 +47,11 @@ then fi #================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +# MANAGE FAILURE OF THE SCRIPT #================================================= -if [ $change_domain -eq 0 ] -then - # Backup the current version of the app - ynh_backup_before_upgrade - ynh_clean_setup () { - # restore it if the upgrade fails - ynh_restore_upgradebackup - } - # Exit if an error occurs during the execution of the script - ynh_abort_if_errors -fi +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors #================================================= # STANDARD MODIFICATIONS