diff --git a/doc/.DS_Store b/doc/.DS_Store new file mode 100644 index 0000000..fc7b8a4 Binary files /dev/null and b/doc/.DS_Store differ diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..4efcc1e --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,8 @@ +## Configuration + +Use the admin panel of your Pi-hole to configure this app. You may also need to follow the [post-install guide](https://docs.pi-hole.net/main/post-install/) to setup Pi-hole either as a *DNS server* or a *DHCP server*. + +## Limitations + +* Activate DHCP with Pi-hole needs manual configuration of your router. +* Pi-Hole can't be updated beyond version 3.3.1, because higher versions use an integrated version of dnsmasq. This would require disabling the version of dnsmasq used by YunoHost. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md new file mode 100644 index 0000000..ceb9a25 --- /dev/null +++ b/doc/DISCLAIMER_fr.md @@ -0,0 +1,8 @@ +## Configuration + +Utiliser le panneau d'administration de votre Pi-hole pour configurer cette application. Vous devrez peut-être aussi suivre le [guide de post-installation] (https://docs.pi-hole.net/main/post-install/) pour configurer Pi-hole en tant que *serveur DNS* ou *serveur DHCP*. + +## Limitations + +* Activer DHCP avec Pi-hole nécessite une configuration manuelle de votre routeur. +* Pi-Hole ne peut pas être mis à jour au-delà de la version 3.3.1, car les versions supérieures utilisent une version intégrée de dnsmasq. Ce qui oblige a désactiver la version de dnsmasq utilisée par YunoHost. diff --git a/doc/screenshots/dashboard.png b/doc/screenshots/dashboard.png new file mode 100644 index 0000000..f12fdbc Binary files /dev/null and b/doc/screenshots/dashboard.png differ diff --git a/manifest.json b/manifest.json index 8da8fb2..218ce8e 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,12 @@ }, "version": "5.3.1~ynh1", "url": "https://pi-hole.net/", + "upstream": { + "license": "EUPL-1.2", + "website": "https://pi-hole.net/", + "admindoc": "https://docs.pi-hole.net", + "code": "https://github.com/pi-hole/pi-hole/" + }, "license": "EUPL-1.2", "maintainer": { "name": "", @@ -30,29 +36,17 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain for the admin interface of Pi-hole", - "fr": "Choisissez un domaine pour l'interface admin de Pi-hole" - }, "example": "domain.org" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for the admin interface of Pi-hole", - "fr": "Choisissez un chemin pour l'interface admin de Pi-hole" - }, "example": "/pihole", "default": "/pihole" }, { "name": "admin", "type": "user", - "ask": { - "en": "Choose the Pi-hole administrator (must be an existing YunoHost user)", - "fr": "Administrateur de Pi-hole (doit être un utilisateur YunoHost existant)" - }, "example": "john" }, { diff --git a/scripts/restore b/scripts/restore index a6e1bb9..3b485fa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -119,7 +119,7 @@ ynh_install_app_dependencies $app_depencencies # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add pihole-FTL --description "PiHole backend service" --log "/var/log/pihole-FTL.log" +yunohost service add pihole-FTL --description="PiHole backend service" --log="/var/log/pihole-FTL.log" --needs_exposed_ports=$port #================================================= # RESTORE THE CRON FILE @@ -162,7 +162,7 @@ then ynh_systemd_action --action=stop --service_name=dnsmasq # Disable the real dnsmasq service - ynh_exec_warn_less systemctl disable dnsmasq + ynh_exec_warn_less systemctl disable dnsmasq --quiet # And move the files that make the service available in systemd to really disable it mv /lib/systemd/system/dnsmasq.service /lib/systemd/system/.dnsmasq.service.backup_by_pihole @@ -178,7 +178,7 @@ then pihole_local_repo="/etc/.pihole" cp -a $pihole_local_repo/advanced/Templates/pihole-FTL.service /etc/init.d/pihole-FTL chmod +x /etc/init.d/pihole-FTL - ynh_exec_warn_less systemctl enable pihole-FTL + ynh_exec_warn_less systemctl enable pihole-FTL --quiet # Replace the service dnsmasq by pihole-FTL # That way, YunoHost can continue to use dnsmasq by actually using pihole-FTL @@ -257,7 +257,7 @@ ynh_store_file_checksum --file="$setupVars" #================================================= ynh_script_progression --message="Restarting PiHole-FTL..." --weight=2 -ynh_exec_warn_less systemctl enable pihole-FTL +ynh_exec_warn_less systemctl enable pihole-FTL --quiet ynh_systemd_action --action=restart --service_name=pihole-FTL #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index f9e8151..0634918 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -305,7 +305,7 @@ else cp -a $pihole_local_repo/advanced/Templates/pihole-FTL.service /etc/init.d/pihole-FTL chmod +x /etc/init.d/pihole-FTL - ynh_exec_warn_less systemctl enable pihole-FTL + ynh_exec_warn_less systemctl enable pihole-FTL --quiet # Replace the service dnsmasq by pihole-FTL # That way, YunoHost can continue to use dnsmasq by actually using pihole-FTL