Merge pull request #270 from YunoHost-Apps/ci-auto-update-sources-240930

Upgrade sources

ALL_README.md

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

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.18.2~ynh1
+**Shipped version:** 5.18.2~ynh2
 
 ## 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.18.2~ynh1
+**Versión actual:** 5.18.2~ynh2
 
 ## 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.18.2~ynh1
+**Paketatutako bertsioa:** 5.18.2~ynh2
 
 ## 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.18.2~ynh1
+**Version incluse :** 5.18.2~ynh2
 
 ## 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.18.2~ynh1
+**Versión proporcionada:** 5.18.2~ynh2
 
 ## Capturas de pantalla
 

README_id.md

@@ -0,0 +1,51 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Pi-hole untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/pihole.svg)](https://ci-apps.yunohost.org/ci/apps/pihole/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/pihole.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/pihole.maintain.svg)
+
+[![Pasang Pi-hole dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pihole)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Pi-hole 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
+
+The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
+
+**Versi terkirim:** 5.18.2~ynh2
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada Pi-hole](./doc/screenshots/dashboard.png)
+
+## :red_circle: Antifitur
+
+- **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.
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://pi-hole.net/>
+- Dokumentasi admin resmi: <https://docs.pi-hole.net>
+- Depot kode aplikasi hulu: <https://github.com/pi-hole/pi-hole>
+- Gudang YunoHost: <https://apps.yunohost.org/app/pihole>
+- Laporkan bug: <https://github.com/YunoHost-Apps/pihole_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/pihole_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/pihole_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade pihole -u https://github.com/YunoHost-Apps/pihole_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>

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.2~ynh2
+
+## 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

@@ -0,0 +1,51 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# Pi-hole для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/pihole.svg)](https://ci-apps.yunohost.org/ci/apps/pihole/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/pihole.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/pihole.maintain.svg)
+
+[![Установите Pi-hole с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pihole)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить Pi-hole быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
+
+**Поставляемая версия:** 5.18.2~ynh2
+
+## Снимки экрана
+
+![Снимок экрана Pi-hole](./doc/screenshots/dashboard.png)
+
+## :red_circle: Анти-функции
+
+- **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.
+
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения: <https://pi-hole.net/>
+- Официальная документация администратора: <https://docs.pi-hole.net>
+- Репозиторий кода главной ветки приложения: <https://github.com/pi-hole/pi-hole>
+- Магазин YunoHost: <https://apps.yunohost.org/app/pihole>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/pihole_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/pihole_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/pihole_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade pihole -u https://github.com/YunoHost-Apps/pihole_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>

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.18.2~ynh1
+**分发版本：** 5.18.2~ynh2
 
 ## 截图
 

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.18.2~ynh1"
+version = "5.18.2~ynh2"
 
 maintainers = []
 
@@ -55,21 +55,21 @@ ram.runtime = "200M"
 [resources]
     [resources.sources]
     [resources.sources.pi-hole_core]
-    url = "https://github.com/pi-hole/pi-hole/archive/v5.18.2.tar.gz"
-    sha256 = "43bb1bea958535dcb2dab4b0dbda432859c6fa83a5d1f94eb5239d77f1e32605"
+    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.21.tar.gz"
+    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.25.2.tar.gz"
+    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"
@@ -112,4 +112,5 @@ ram.runtime = "200M"
         "netcat-openbsd",
         "procps",
         "jq",
+        "xxd",
     ]

scripts/install

@@ -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/remove

@@ -70,9 +70,6 @@ ynh_script_progression --message="Removing various files..." --weight=1
 # Remove a cron file
 ynh_secure_remove --file="/etc/cron.d/$app"
 
-# Remove the log files
-ynh_secure_remove --file="/var/log/$app"
-
 # Remove main script
 ynh_secure_remove --file="$PI_HOLE_BIN_DIR/pihole"
 ynh_secure_remove --file="/etc/bash_completion.d/pihole"

scripts/upgrade

@@ -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