diff --git a/README.md b/README.md index 2e9b18c..af7ce5d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ 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. -**Shipped version:** 5.11.4~ynh1 +**Shipped version:** 5.13~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 203d135..22b73a9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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.11.4~ynh1 +**Version incluse :** 5.13~ynh1 ## Captures d'écran diff --git a/check_process b/check_process index f7f8cef..e817edc 100644 --- a/check_process +++ b/check_process @@ -27,6 +27,7 @@ upgrade=1 from_commit=cfa9c5a3dbcfb765dcca3b2e7d179756afe26def # 5.11.4~ynh1 upgrade=1 from_commit=3d2f68c4e19f335e63f8ffa259708b38a58c8f67 + upgrade=1 from_commit=4999654987af8b1427a6c72f8af482b235bb46db backup_restore=1 multi_instance=0 port_already_use=1 @@ -37,5 +38,5 @@ Email= Notification=none ;;; Upgrade options - ; commit=cfa9c5a3dbcfb765dcca3b2e7d179756afe26def - name=Merge pull request #66 + ; commit=4999654987af8b1427a6c72f8af482b235bb46db + name=Merge pull request #88 diff --git a/conf/pi-hole_AdminLTE.src b/conf/pi-hole_AdminLTE.src index 3727406..5c066f5 100644 --- a/conf/pi-hole_AdminLTE.src +++ b/conf/pi-hole_AdminLTE.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.13.tar.gz -SOURCE_SUM=67d01bd4245024c9c6f9bf474bb17e8bde269ccc42ba4bb5a99da25632162c21 +SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.16.tar.gz +SOURCE_SUM=9874e4745068a737cf4f6277719fc725ac25308fef950cdc27ff56aaa551ac4b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/pi-hole_Core.src b/conf/pi-hole_Core.src index 0792efb..4bb42b0 100644 --- a/conf/pi-hole_Core.src +++ b/conf/pi-hole_Core.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.11.4.tar.gz -SOURCE_SUM=e24db53c63a6ea240f0852bd082b224dda91ad4fd049ab700c218b9672fc59cf +SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.13.tar.gz +SOURCE_SUM=26222254df130b56d7e0419c9828c995415b2aafd1717f92850c6cb4e0e20d2d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/pi-hole_FTL.src b/conf/pi-hole_FTL.src index 65b730b..bdc92a3 100644 --- a/conf/pi-hole_FTL.src +++ b/conf/pi-hole_FTL.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.16.1.tar.gz -SOURCE_SUM=2fc5f2ce76328d10d4789cdd4bb73365f368e2d4c8daeeb0869b1a51771cbde1 +SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.18.2.tar.gz +SOURCE_SUM=69f167dd69fdc3ca18ee9067f0f8728f9d9be5686ecb68dc7d05df21e94f3a70 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/config_panel.toml.example b/config_panel.toml.example index d8518a1..1c3cfad 100644 --- a/config_panel.toml.example +++ b/config_panel.toml.example @@ -1,4 +1,4 @@ -version = "0.1" +version = "1.0" name = "PiHole configuration panel" [main] diff --git a/manifest.json b/manifest.json index fcfff20..f6da29c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ad blocking via your own DNS server", "fr": "Filtrage publicitaire via votre propre serveur DNS" }, - "version": "5.11.4~ynh1", + "version": "5.13~ynh1", "url": "https://pi-hole.net/", "upstream": { "license": "EUPL-1.2", @@ -26,12 +26,12 @@ } ], "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ "nginx", - "php7.3-fpm" + "php7.4-fpm" ], "arguments": { "install": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index ba82989..82285ba 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,8 +9,8 @@ php_dependencies="php$YNH_DEFAULT_PHP_VERSION-common php$YNH_DEFAULT_PHP_VERSION # dependencies used by the app (must be on a single line) pkg_dependencies="cmake build-essential libgmp-dev libidn11-dev nettle-dev libreadline-dev sqlite3 cron curl iputils-ping psmisc unzip idn2 libcap2-bin dns-root-data libcap2 netcat-openbsd procps jq $php_dependencies" -pihole_adminlte_version=5.13 -pihole_flt_version=5.16.1 +pihole_adminlte_version=5.16 +pihole_flt_version=5.18.2 PI_HOLE_LOCAL_REPO="/etc/.pihole" PI_HOLE_INSTALL_DIR="/opt/pihole" diff --git a/scripts/install b/scripts/install index 20dc843..c1a968c 100644 --- a/scripts/install +++ b/scripts/install @@ -353,7 +353,7 @@ admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4) if [ $enable_dhcp -eq 1 ] then - dhcp_alert="You asked to use the internal DHCP server of dnsmasq with PiHole. + dhcp_alert="You asked to use the internal DHCP server of dnsmasq with Pi-hole. You should really read the __URL_TAG1__documentation about that__URL_TAG2__https://github.com/YunoHost-Apps/pihole_ynh/blob/master/dhcp.md__URL_TAG3__ " diff --git a/scripts/restore b/scripts/restore index 035e777..04f3281 100644 --- a/scripts/restore +++ b/scripts/restore @@ -274,12 +274,12 @@ ynh_maintenance_mode_OFF # SEND A README FOR THE ADMIN #================================================= -# Get main domain and buid the url of the admin panel of the app. +# Get main domain and buid the URL of the admin panel of the app. admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app" if [ $enable_dhcp -eq 1 ] then - dhcp_alert="You asked to use the internal DHCP server of Dnsmasq with PiHole. + dhcp_alert="You asked to use the internal DHCP server of Dnsmasq with Pi-hole. You should really read the __URL_TAG1__documentation about that__URL_TAG2__https://github.com/YunoHost-Apps/pihole_ynh/blob/master/dhcp.md__URL_TAG3__ " diff --git a/scripts/upgrade b/scripts/upgrade index 8286065..adbed2c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -152,11 +152,11 @@ ynh_install_app_dependencies $pkg_dependencies # PHP-FPM CONFIGURATION #================================================= -# Overwrite the php-fpm configuration only if it's allowed +# Overwrite the PHP-FPM configuration only if it's allowed if [ $overwrite_phpfpm -eq 1 ] then ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=3 - # Create a dedicated php-fpm config + # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --dedicated_service fi @@ -164,7 +164,7 @@ fi # NGINX CONFIGURATION #================================================= -# Overwrite the nginx configuration only if it's allowed +# Overwrite the NGINX configuration only if it's allowed if [ $overwrite_nginx -eq 1 ] then ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 @@ -252,7 +252,7 @@ ynh_replace_string --match_string="59 1 " --replace_string="$((1 + RANDOM % 58)) # Randomize update checker time ynh_replace_string --match_string="59 17" --replace_string="$((1 + RANDOM % 58)) $((12 + RANDOM % 8))" --target_file="/etc/cron.d/pihole" -# Remove git usage for version. Which fails because we use here a release instead of master. +# Remove Git usage for version. Which fails because we use here a release instead of master. ynh_replace_string --match_string=".*updatechecker.*" --replace_string="#&" --target_file=/etc/cron.d/pihole #================================================= @@ -418,7 +418,7 @@ ynh_maintenance_mode_OFF # Get main domain and buid the url of the admin panel of the app. admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app" -# If a html email is required. Apply html to the changelog. +# If a HTML email is required. Apply HTML to the changelog. if [ "$admin_mail_html" -eq 1 ]; then format=html else @@ -428,7 +428,7 @@ ynh_app_changelog --format=$format if [ $enable_dhcp -eq 1 ] then - dhcp_alert="You asked to use the internal DHCP server of dnsmasq with PiHole. + dhcp_alert="You asked to use the internal DHCP server of dnsmasq with Pi-hole. You should really read the documentation about that, https://github.com/YunoHost-Apps/pihole_ynh/blob/master/dhcp.md "