diff --git a/README.md b/README.md index 3af190cd..fce8b785 100644 --- a/README.md +++ b/README.md @@ -970,10 +970,10 @@ SOFTWARE. [phlex-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg [phlex-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg [phlex-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg -[addon-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/tree/v4.0.0 -[addon-doc-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/blob/v4.0.0/README.md +[addon-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/tree/v4.1.0 +[addon-doc-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/blob/v4.1.0/README.md [pi-hole-issue]: https://github.com/hassio-addons/addon-pi-hole/issues -[pi-hole-version-shield]: https://img.shields.io/badge/version-v4.0.0-blue.svg +[pi-hole-version-shield]: https://img.shields.io/badge/version-v4.1.0-blue.svg [pi-hole-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/pi-hole-armhf.svg [pi-hole-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg [pi-hole-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg diff --git a/pi-hole/CHANGELOG.md b/pi-hole/CHANGELOG.md index ca6c67c9..f5637818 100644 --- a/pi-hole/CHANGELOG.md +++ b/pi-hole/CHANGELOG.md @@ -1,48 +1,55 @@ [Full Changelog][changelog] -๐ŸŽ‰ This is a major release of the add-on, changing and improving a lot! - -โœจ First of all, this release introduces Ingress support. This means you can now access the interface from Home Assistant, even via the NabuCasa cloud. If you had configured a `panel_iframe`, you can no go ahead and remove that and check the "Show in Sidebar" toggle on the add-on page. Still, want to access the Pi-Hole web interface directly? You can always do that, by setting a port in the add-on network options. - -๐Ÿ” Pi-hole has single password protection (yeah, without username even), which is not really uh... Ok, we've improved that by adding Home Assistant authentication. You can now login with your HA username/password. However, when using Ingress, Home Assistant will take care of that for you ๐ŸŽ‰ (So this only applies to direct access). - -๐Ÿก Integrating the add-on with Home Assistant has always been a pain. We've solved that in this release, by adding a special endpoint for Pi-Hole integration of Home Assistant. The example in the add-on documentation is now a "copy, paste, restart & enjoy"-example. There is nothing more to it. - -๐ŸŒ The add-on has been adjusted to work and play nicely with the new Hass.io DNS services. Should solve a lot of headaches for quite a few people. +This is a general maintenance release, containing a lot of internal upgrades and fixes. ### :hammer: Changes -- :arrow_up: Upgrades gcc/g++ to 8.3.0-r0 -- :arrow_up: Upgrades wget to 1.20.3-r0 -- :arrow_up: Upgrades Pi-hole web interface to v4.3 -- :pencil2: Maintaince -> Maintenance -- :arrow_up: Upgrades libexecinfo-dev to 1.1-r1 -- :arrow_up: Upgrades linux-headers to 4.19.36-r0 -- :arrow_up: Upgrades nettle-dev to 3.4.1-r1 -- :fire: Removes Bash, since the base image provides it -- :arrow_up: Upgrades bc to 1.07.1-r1 -- :arrow_up: Upgrades bind-tools to 9.14.3-r0 -- :arrow_up: Upgrades coreutils to 8.31-r0 -- :arrow_up: Upgrades git to 2.22.0-r0 -- :arrow_up: Upgrades grep to 3.3-r0 -- :arrow_up: Upgrades libcap to 2.27-r0 -- :arrow_up: Upgrades libxml2 to 2.9.9-r2 -- :arrow_up: Upgrades ncurses to 6.1_p20190518-r0 -- :arrow_up: Upgrades openssl to 1.1.1c-r0 -- :arrow_up: Upgrades perl to 5.28.2-r1 -- :arrow_up: Upgrades sed to 4.7-r0 -- :arrow_up: Upgrades sudo to 1.8.27-r0 -- :arrow_up: Upgrades Pi-hole core to v4.3.1 -- :ambulance: Fixes path handling for SSL certificates -- :arrow_up: Upgrades add-on base image to v4.1.1 -- :arrow_up: Upgrades musl-dev to 1.1.22-r3 -- :arrow_up: Upgrades php to 7.3.8-r0 -- :arrow_up: Upgrades nginx to 1.16.1-r0 -- :arrow_up: Upgrades Pi-hole FTL to v4.3.1 -- :tractor: :hammer: Complete rewrite of the add-on -- :books: Updates documentation to match latest changes +- ๐Ÿš‘ Fixes issues with HTTP header checking (#89) +- :fire: Remove virtual host configuration (#90) +- ๐Ÿš‘Fix admin/queries.php for ingress users (#97) +- ๐Ÿš‘Fix admin/queries.php for direct users (#98) +- ๐Ÿ’„Fix error log path to /dev/stderr (#91) +- :books: Update documentation on how to integrate with Home Assisโ€ฆ (#102) +- โฌ†๏ธ Upgrades Pi-hole web interface to v4.3.2 (#107) +- :fire: Removed coffee patch +- :hammer: Updated fix killall brain damage patch +- :books: Update add-on installation instructions +- :shirt: Fixes Markdownlint warnings +- :fireworks: Updates maintenance/license year to 2020 +- :pencil2: Funding adjustments +- :pencil2: Fixes some spelling and grammar +- :arrow_up: Upgrades gcc to 9.2.0-r3 +- :arrow_up: Upgrades musl-dev to 1.1.24-r0 +- :arrow_up: Upgrades nettle-dev to 3.5.1-r0 +- :arrow_up: Upgrades sqlite to 3.30.1-r1 +- :arrow_up: Upgrades psmisc to 23.3-r0 +- :arrow_up: Upgrades openssl to 1.1.1d-r3 +- :arrow_up: Upgrades bind-tools to 9.14.8-r5 +- :arrow_up: Upgrades logrotate to 3.15.1-r0 +- :arrow_up: Upgrades perl to 5.30.1-r0 +- :arrow_up: Upgrades git to 2.24.1-r0 +- :arrow_up: Upgrades lua-resty-http to 0.15-r0 +- :arrow_up: Upgrades ncurses to 6.1_p20191130-r0 +- :arrow_up: Upgrades procps to 3.3.16-r0 +- :ambulance: Hot patch FTL for nettle 3.5 compatibility +- :books: Update Home Assistant integration instruction +- :arrow_up: Upgrades nginx to 1.16.1-r6 +- :books: Update add-on documentation to use new YAML configuration format +- :hammer: Re-branding +- :hammer: Update add-on config with new password & list features +- :hammer: Updates for upstream Supervisor changes +- :ambulance: Fix broken Home Assistant DNS servers in list +- ๐Ÿ”จAdmin scripts rewrite (#123) +- :arrow_up: Upgrades add-on base image to v7.0.2 +- ๐Ÿ”จAdd access control to api.conf (#114) +- :arrow_up: Upgrades libxml2 to 2.9.10-r2 +- :arrow_up: Upgrades ncurses to 6.1_p20200118-r2 +- :arrow_up: Upgrades php7 to 7.3.15-r0 +- :arrow_up: Upgrades sudo to 1.8.31-r0 +- :arrow_up: Upgrades Pi-hole core to v4.4 -[changelog]: https://github.com/hassio-addons/addon-pi-hole/compare/v3.0.2...v4.0.0 +[changelog]: https://github.com/hassio-addons/addon-pi-hole/compare/v4.0.0...v4.1.0 Questions? Join our Discord server! https://discord.me/hassioaddons -Enjoying my add-ons? Consider supporting my work: https://patreon.com/frenck \ No newline at end of file +Enjoying my add-ons? Consider supporting my work: +https://github.com/sponsors/frenck or https://patreon.com/frenck \ No newline at end of file diff --git a/pi-hole/README.md b/pi-hole/README.md index adc501ee..12364ec9 100644 --- a/pi-hole/README.md +++ b/pi-hole/README.md @@ -1,14 +1,14 @@ -# Community Hass.io Add-ons: Pi-hole +# Home Assistant Community Add-on: Pi-hole [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield] [![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum] -[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee] +[![Sponsor Frenck via GitHub Sponsors][github-sponsors-shield]][github-sponsors] -[![Support my work on Patreon][patreon-shield]][patreon] +[![Support Frenck on Patreon][patreon-shield]][patreon] -Network-wide ad blocking using your Hass.io instance +Network-wide ad blocking ## About @@ -17,22 +17,22 @@ on a dedicated Raspberry Pi connected to your home network. Pi-hole lets you block advertisements for every device that connects to your network without the need for any client-side software. -This add-on is a port of Pi-hole to be able to run on Hass.io and is based on -Alpine Linux and is using Docker. +This add-on is a port of Pi-hole to be able to run on Home Assistant and +is based on Alpine Linux and is using Docker. [Click here for the full documentation][docs] -[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg -[buymeacoffee]: https://www.buymeacoffee.com/frenck [discord-shield]: https://img.shields.io/discord/478094546522079232.svg [discord]: https://discord.me/hassioaddons -[docs]: https://github.com/hassio-addons/addon-pi-hole/blob/v4.0.0/README.md +[docs]: https://github.com/hassio-addons/addon-pi-hole/blob/v4.1.0/README.md [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [forum]: https://community.home-assistant.io/t/community-hass-io-add-on-pi-hole/33817?u=frenck -[maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg -[patreon-shield]: https://www.frenck.nl/images/patreon.png +[github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png +[github-sponsors]: https://github.com/sponsors/frenck +[maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg +[patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png [patreon]: https://www.patreon.com/frenck [pi-hole]: https://pi-hole.net/ [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg -[release-shield]: https://img.shields.io/badge/version-v4.0.0-blue.svg -[release]: https://github.com/hassio-addons/addon-pi-hole/tree/v4.0.0 \ No newline at end of file +[release-shield]: https://img.shields.io/badge/version-v4.1.0-blue.svg +[release]: https://github.com/hassio-addons/addon-pi-hole/tree/v4.1.0 \ No newline at end of file diff --git a/pi-hole/config.json b/pi-hole/config.json index d86c755c..09540525 100644 --- a/pi-hole/config.json +++ b/pi-hole/config.json @@ -1,8 +1,8 @@ { "name": "Pi-hole", - "version": "4.0.0", + "version": "4.1.0", "slug": "pi-hole", - "description": "Network-wide ad blocking using your Hass.io instance", + "description": "Network-wide ad blocking", "url": "https://github.com/hassio-addons/addon-pi-hole", "webui": "[PROTO:ssl]://[HOST]:[PORT:4865]", "ingress": true, @@ -23,7 +23,7 @@ }, "ports_description": { "53/udp": "DNS server port", - "80/tcp": "Web interface (Not required for Hass.io Ingress)", + "80/tcp": "Web interface (Not required for Ingress)", "4865/tcp": "API endpoint (For HA integration)" }, "boot": "auto", @@ -47,11 +47,10 @@ "ipv6": true, "ipv4_address": "", "ipv6_address": "", - "virtual_host": "", "hosts": [] }, "schema": { - "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?", + "log_level": "list(trace|debug|info|notice|warning|error|fatal)?", "update_lists_on_start": "bool", "ssl": "bool", "certfile": "str", @@ -60,7 +59,6 @@ "ipv6": "bool", "ipv4_address": "str", "ipv6_address": "str", - "virtual_host": "str", "hosts": [ { "name": "str",