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

Merge pull request #83 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2022-07-16 15:50:50 +02:00 • committed by GitHub
commit 3d2f68c4e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 52 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
README.md
View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Pi-hole for YunoHost # Pi-hole for YunoHost
[![Integration level](https://dash.yunohost.org/integration/pihole.svg)](https://dash.yunohost.org/appci/app/pihole) ![](https://ci-apps.yunohost.org/ci/badges/pihole.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/pihole.maintain.svg) [![Integration level](https://dash.yunohost.org/integration/pihole.svg)](https://dash.yunohost.org/appci/app/pihole) ![Working status](https://ci-apps.yunohost.org/ci/badges/pihole.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pihole.maintain.svg)
[![Install Pi-hole with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pihole) [![Install Pi-hole with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pihole)
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
@ -17,13 +17,11 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software. The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
**Shipped version:** 5.10~ynh1 **Shipped version:** 5.11.4~ynh1
## Screenshots ## Screenshots
![](./doc/screenshots/dashboard.png) ![Screenshot of Pi-hole](./doc/screenshots/dashboard.png)
## Disclaimers / important information ## Disclaimers / important information
@ -90,21 +88,22 @@ sudo ifconfig eth0 0.0.0.0 && sudo dhclient eth0
> Don't forget to turn off the DHCP of your router if your server is working again. > Don't forget to turn off the DHCP of your router if your server is working again.
## Documentation and resources ## Documentation and resources
* Official app website: https://pi-hole.net/ * Official app website: <https://pi-hole.net/>
* Official admin documentation: https://docs.pi-hole.net * Official admin documentation: <https://docs.pi-hole.net>
* Upstream app code repository: https://github.com/pi-hole/pi-hole/ * Upstream app code repository: <https://github.com/pi-hole/pi-hole/>
* YunoHost documentation for this app: https://yunohost.org/app_pihole * YunoHost documentation for this app: <https://yunohost.org/app_pihole>
* Report a bug: https://github.com/YunoHost-Apps/pihole_ynh/issues * Report a bug: <https://github.com/YunoHost-Apps/pihole_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/pihole_ynh/tree/testing). Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/pihole_ynh/tree/testing).
To try the testing branch, please proceed like that. To try the testing branch, please proceed like that.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/pihole_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/pihole_ynh/tree/testing --debug
or or
sudo yunohost app upgrade pihole -u 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
``` ```
**More info regarding app packaging:** https://yunohost.org/packaging_apps **More info regarding app packaging:** <https://yunohost.org/packaging_apps>

29
README_fr.md
View file

@ -1,10 +1,14 @@
<!--
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.
-->
# Pi-hole pour YunoHost # Pi-hole pour YunoHost
[![Niveau d'intégration](https://dash.yunohost.org/integration/pihole.svg)](https://dash.yunohost.org/appci/app/pihole) ![](https://ci-apps.yunohost.org/ci/badges/pihole.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/pihole.maintain.svg) [![Niveau d'intégration](https://dash.yunohost.org/integration/pihole.svg)](https://dash.yunohost.org/appci/app/pihole) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pihole.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pihole.maintain.svg)
[![Installer Pi-hole avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pihole) [![Installer Pi-hole avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pihole)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer Pi-hole rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet d'installer Pi-hole 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, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -13,13 +17,11 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software. The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
**Version incluse :** 5.10~ynh1 **Version incluse :** 5.11.4~ynh1
## Captures d'écran ## Captures d'écran
![](./doc/screenshots/dashboard.png) ![Capture d'écran de Pi-hole](./doc/screenshots/dashboard.png)
## Avertissements / informations importantes ## Avertissements / informations importantes
@ -87,21 +89,22 @@ sudo ifconfig eth0 0.0.0.0 && sudo dhclient eth0
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : https://pi-hole.net/ * Site officiel de l'app : <https://pi-hole.net/>
* Documentation officielle de l'admin : https://docs.pi-hole.net * Documentation officielle de l'admin : <https://docs.pi-hole.net>
* Dépôt de code officiel de l'app : https://github.com/pi-hole/pi-hole/ * Dépôt de code officiel de l'app : <https://github.com/pi-hole/pi-hole/>
* Documentation YunoHost pour cette app : https://yunohost.org/app_pihole * Documentation YunoHost pour cette app : <https://yunohost.org/app_pihole>
* Signaler un bug : https://github.com/YunoHost-Apps/pihole_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/pihole_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/pihole_ynh/tree/testing). Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/pihole_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit. Pour essayer la branche testing, procédez comme suit.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/pihole_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/pihole_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade pihole -u 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
``` ```
**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>

4
conf/FTL.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.12.tar.gz SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.16.1.tar.gz
SOURCE_SUM=cc0864cdf7c10b82f04049e97dafef2eacb2b8155e7cb11e0383482f5dc0f1d6 SOURCE_SUM=2fc5f2ce76328d10d4789cdd4bb73365f368e2d4c8daeeb0869b1a51771cbde1
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

4
conf/admin_dashboard.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.12.tar.gz SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.13.tar.gz
SOURCE_SUM=c770daaf5360c659ab3b9c07a118f0170307dd1e7857ece5d02ef5e3f1ead057 SOURCE_SUM=67d01bd4245024c9c6f9bf474bb17e8bde269ccc42ba4bb5a99da25632162c21
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.10.tar.gz SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.11.4.tar.gz
SOURCE_SUM=fb995f62ab83713222d538e0836557de651a94f61622bf930aa88187b70ae2ee SOURCE_SUM=e24db53c63a6ea240f0852bd082b224dda91ad4fd049ab700c218b9672fc59cf
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

33
conf/pihole-FTL.conf
View file

@ -1,34 +1,37 @@
; Listen only for local socket connections or permit all connections #; Pi-hole FTL config file
; localonly|all #; Comments should start with #; to avoid issues with PHP and bash reading this file
#; Listen only for local socket connections or permit all connections
#; localonly|all
SOCKET_LISTENING=localonly SOCKET_LISTENING=localonly
; On which port should FTL be listening? #; On which port should FTL be listening?
FTLPORT=__PORT__ FTLPORT=__PORT__
; Display all queries? Set to no to hide query display #; Display all queries? Set to no to hide query display
; yes|no #; yes|no
QUERY_DISPLAY=yes QUERY_DISPLAY=yes
; Allow FTL to analyze AAAA queries from pihole.log? #; Allow FTL to analyze AAAA queries from pihole.log?
; yes|no #; yes|no
AAAA_QUERY_ANALYSIS=yes AAAA_QUERY_ANALYSIS=yes
; How long should queries be stored in the database? Setting this to 0 disables the database altogether #; How long should queries be stored in the database? Setting this to 0 disables the database altogether
MAXDBDAYS=365 MAXDBDAYS=365
; Should FTL try to resolve IPv6 addresses to host names? #; Should FTL try to resolve IPv6 addresses to host names?
; yes|no #; yes|no
RESOLVE_IPV6=yes RESOLVE_IPV6=yes
; Should FTL try to resolve IPv4 addresses to host names? #; Should FTL try to resolve IPv4 addresses to host names?
; yes|no #; yes|no
RESOLVE_IPV4=yes RESOLVE_IPV4=yes
; How often do we store queries in FTL's database [minutes]? #; How often do we store queries in FTL's database [minutes]?
DBINTERVAL=1.0 DBINTERVAL=1.0
; Specify path and filename of FTL's SQLite long-term database. Setting this to DBFILE= disables the database altogether #; Specify path and filename of FTL's SQLite long-term database. Setting this to DBFILE= disables the database altogether
DBFILE=/etc/pihole/pihole-FTL.db DBFILE=/etc/pihole/pihole-FTL.db
; Up to how many hours of queries should be imported from the database and logs? Maximum is 744 (31 days) #; Up to how many hours of queries should be imported from the database and logs? Maximum is 744 (31 days)
MAXLOGAGE=24.0 MAXLOGAGE=24.0

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Network-wide ad blocking via your own DNS server", "en": "Network-wide ad blocking via your own DNS server",
"fr": "Filtrage publicitaire via votre propre serveur DNS" "fr": "Filtrage publicitaire via votre propre serveur DNS"
}, },
"version": "5.10~ynh1", "version": "5.11.4~ynh1",
"url": "https://pi-hole.net/", "url": "https://pi-hole.net/",
"upstream": { "upstream": {
"license": "EUPL-1.2", "license": "EUPL-1.2",