Merge pull request #156 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -6,5 +6,6 @@
 - [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)

README.md

@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
-**Shipped version:** 5.14.2~ynh4
+**Shipped version:** 5.18.3~ynh1
 
 ## Screenshots
 

README_es.md

@@ -18,7 +18,7 @@ No se debe editar a mano.
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
-**Versión actual:** 5.14.2~ynh4
+**Versión actual:** 5.18.3~ynh1
 
 ## Capturas
 
@@ -38,7 +38,7 @@ The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content
 
 ## Información para desarrolladores
 
-Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/pihole_ynh/tree/testing
+Por favor enviar sus correcciones a la [rama `testing`](https://github.com/YunoHost-Apps/pihole_ynh/tree/testing).
 
 Para probar la rama `testing`, sigue asÍ:
 

README_eu.md

@@ -18,7 +18,7 @@ EZ editatu eskuz.
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
-**Paketatutako bertsioa:** 5.14.2~ynh4
+**Paketatutako bertsioa:** 5.18.3~ynh1
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
 Pi-hole® est un puits DNS qui protège vos appareils des contenus indésirables sans installer de logiciel côté client.
 
 
-**Version incluse :** 5.14.2~ynh4
+**Version incluse :** 5.18.3~ynh1
 
 ## Captures d’écran
 

README_gl.md

@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
-**Versión proporcionada:** 5.14.2~ynh4
+**Versión proporcionada:** 5.18.3~ynh1
 
 ## Capturas de pantalla
 

README_id.md

@@ -18,7 +18,7 @@ Ini TIDAK boleh diedit dengan tangan.
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
-**Versi terkirim:** 5.14.2~ynh4
+**Versi terkirim:** 5.18.3~ynh1
 
 ## Tangkapan Layar
 

README_nl.md

@@ -0,0 +1,51 @@
+<!--
+NB: Deze README is automatisch gegenereerd door <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Hij mag NIET handmatig aangepast worden.
+-->
+
+# Pi-hole voor Yunohost
+
+[![Integratieniveau](https://dash.yunohost.org/integration/pihole.svg)](https://ci-apps.yunohost.org/ci/apps/pihole/) ![Mate van functioneren](https://ci-apps.yunohost.org/ci/badges/pihole.status.svg) ![Onderhoudsstatus](https://ci-apps.yunohost.org/ci/badges/pihole.maintain.svg)
+
+[![Pi-hole met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pihole)
+
+*[Deze README in een andere taal lezen.](./ALL_README.md)*
+
+> *Met dit pakket kun je Pi-hole 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
+
+The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
+
+**Geleverde versie:** 5.18.3~ynh1
+
+## Schermafdrukken
+
+![Schermafdrukken van Pi-hole](./doc/screenshots/dashboard.png)
+
+## :red_circle: Anti-eigenschappen
+
+- **Package not maintained**: This YunoHost package is not actively maintained and needs adoption. This means that minimal maintenance is made by volunteers who don't use the app, so you should expect the app to lose reliability over time. You can [learn how to package](https://yunohost.org/packaging_apps_intro) if you'd like to adopt it.
+
+## Documentatie en bronnen
+
+- Officiele website van de app: <https://pi-hole.net/>
+- Officiele beheerdersdocumentatie: <https://docs.pi-hole.net>
+- Upstream app codedepot: <https://github.com/pi-hole/pi-hole>
+- YunoHost-store: <https://apps.yunohost.org/app/pihole>
+- Meld een bug: <https://github.com/YunoHost-Apps/pihole_ynh/issues>
+
+## Ontwikkelaarsinformatie
+
+Stuur je pull request alsjeblieft naar de [`testing`-branch](https://github.com/YunoHost-Apps/pihole_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/pihole_ynh/tree/testing --debug
+of
+sudo yunohost app upgrade pihole -u https://github.com/YunoHost-Apps/pihole_ynh/tree/testing --debug
+```
+
+**Verdere informatie over app-packaging:** <https://yunohost.org/packaging_apps>

README_ru.md

@@ -18,7 +18,7 @@
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
-**Поставляемая версия:** 5.14.2~ynh4
+**Поставляемая версия:** 5.18.3~ynh1
 
 ## Снимки экрана
 

README_zh_Hans.md

@@ -18,7 +18,7 @@
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
-**分发版本：** 5.14.2~ynh4
+**分发版本：** 5.18.3~ynh1
 
 ## 截图
 

manifest.toml

@@ -7,7 +7,7 @@ name = "Pi-hole"
 description.en = "Network-wide ad blocking via your own DNS server"
 description.fr = "Filtrage publicitaire via votre propre serveur DNS"
 
-version = "5.14.2~ynh4"
+version = "5.18.3~ynh1"
 
 maintainers = []
 
@@ -54,23 +54,23 @@ ram.runtime = "200M"
 
 [resources]
     [resources.sources]
-    [resources.sources.pi-hole_core]
-    url = "https://github.com/pi-hole/pi-hole/archive/v5.14.2.tar.gz"
-    sha256 = "fb2bf933eb7dc54de7b5ab220458e0298fb48fa84d5cba1bcb3c72c47bee1051"
+    [resources.sources.main]
+    url = "https://github.com/pi-hole/pi-hole/archive/refs/tags/v5.18.3.tar.gz"
+    sha256 = "871b47b41813342484df8f10981801eba25f27c9cdbeafd6e71f0edbae6818e5"
 
     autoupdate.upstream = "https://github.com/pi-hole/pi-hole"
     autoupdate.strategy = "latest_github_release"
 
     [resources.sources.pi-hole_web]
-    url = "https://github.com/pi-hole/web/archive/v5.18.tar.gz"
-    sha256 = "563d3568f9b4c8bf09c6a7a21995c1827f3438edd17e5e2b55ead873599580c0"
+    url = "https://github.com/pi-hole/web/archive/refs/tags/v5.21.tar.gz"
+    sha256 = "d8b5f8dd3842dd8b0f3f02a4422182740fd26c3db5ceba1dde9fcd122a36c7f0"
 
     autoupdate.upstream = "https://github.com/pi-hole/web"
     autoupdate.strategy = "latest_github_release"
 
     [resources.sources.pi-hole_ftl]
-    url = "https://github.com/pi-hole/FTL/archive/v5.20.tar.gz"
-    sha256 = "c098d65ed7e59865b814d64a0a5fac65914ce93277e69ef97ab87e8479731fc9"
+    url = "https://github.com/pi-hole/FTL/archive/refs/tags/v5.25.2.tar.gz"
+    sha256 = "d14523c623a4a79afe48b64f3953f73eb454c688edeeded9d95b169b275d354d"
 
     autoupdate.upstream = "https://github.com/pi-hole/FTL"
     autoupdate.strategy = "latest_github_release"
@@ -88,11 +88,11 @@ ram.runtime = "200M"
 
     [resources.apt]
     packages = [
-        "php7.4-common",
-        "php7.4-cgi",
-        "php7.4-sqlite3",
-        "php7.4-xml",
-        "php7.4-intl",
+        "php8.2-common",
+        "php8.2-cgi",
+        "php8.2-sqlite3",
+        "php8.2-xml",
+        "php8.2-intl",
         "cmake",
         "build-essential",
         "libgmp-dev",
@@ -112,4 +112,5 @@ ram.runtime = "200M"
         "netcat-openbsd",
         "procps",
         "jq",
+        "xxd",
     ]

scripts/install

@@ -26,7 +26,7 @@ _configure_ports
 ynh_script_progression --message="Setting up source files..." --weight=4
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --source_id="pi-hole_core" --dest_dir="$PI_HOLE_LOCAL_REPO"
+ynh_setup_source --dest_dir="$PI_HOLE_LOCAL_REPO"
 ynh_setup_source --source_id="pi-hole_web" --dest_dir="$install_dir/web"
 ynh_setup_source --source_id="pi-hole_ftl" --dest_dir="$install_dir/ftl"
 
@@ -149,6 +149,9 @@ _add_cron_jobs
 _add_logrotate_config
 
 install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/Templates/pihole-FTL.service" "/etc/init.d/pihole-FTL"
+install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/Templates/pihole-FTL-prestart.sh" "${PI_HOLE_INSTALL_DIR}/pihole-FTL-prestart.sh"
+install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/Templates/pihole-FTL-poststop.sh" "${PI_HOLE_INSTALL_DIR}/pihole-FTL-poststop.sh"
+
 ynh_exec_warn_less systemctl enable pihole-FTL --quiet
 yunohost service add pihole-FTL --description="PiHole backend service" --log="/var/log/pihole-FTL.log" --needs_exposed_ports 53 67
 

scripts/upgrade

@@ -50,7 +50,7 @@ fi
 ynh_script_progression --message="Upgrading source files..." --weight=4
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --source_id="pi-hole_core" --dest_dir="$PI_HOLE_LOCAL_REPO"
+ynh_setup_source --dest_dir="$PI_HOLE_LOCAL_REPO"
 ynh_setup_source --source_id="pi-hole_web" --dest_dir="$install_dir/web"
 ynh_setup_source --source_id="pi-hole_ftl" --dest_dir="$install_dir/ftl"
 
@@ -181,6 +181,8 @@ _add_cron_jobs
 _add_logrotate_config
 
 install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/Templates/pihole-FTL.service" "/etc/init.d/pihole-FTL"
+install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/Templates/pihole-FTL-prestart.sh" "${PI_HOLE_INSTALL_DIR}/pihole-FTL-prestart.sh"
+install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/Templates/pihole-FTL-poststop.sh" "${PI_HOLE_INSTALL_DIR}/pihole-FTL-poststop.sh"
 ynh_exec_warn_less systemctl enable pihole-FTL --quiet
 yunohost service add pihole-FTL --description="PiHole backend service" --log="/var/log/pihole-FTL.log" --needs_exposed_ports 53 67