From bf029b5006c61277086a079b6d95f0e6fff3c92a Mon Sep 17 00:00:00 2001 From: Janis Simsons <6424248+janissimsons@users.noreply.github.com> Date: Sun, 9 Feb 2020 13:47:23 +0200 Subject: [PATCH 1/9] Update nginx-configuration.md Added support for Raspbian Buster and described how to avoid issue #2828 --- docs/guides/nginx-configuration.md | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/docs/guides/nginx-configuration.md b/docs/guides/nginx-configuration.md index d8172e49..15007544 100644 --- a/docs/guides/nginx-configuration.md +++ b/docs/guides/nginx-configuration.md @@ -1,7 +1,9 @@ ### Notes & Warnings - **This is an unsupported configuration created by the community** +- If you're using Raspbian Buster (debian 10), then you should install 'php7.3-fpm' instead of v7.0, and change all instances of 'php7.0-fpm' to 'php7.3-fpm'. - If you're using php5, change all instances of `php7.0-fpm` to `php5-fpm` and change `/run/php/php7.0-fpm.sock` to `/var/run/php5-fpm.sock` +- The `php7.0-sqlite` package must be installed otherwise Networking and Querying will throw an error that it can't access the database. ### Basic requirements @@ -12,9 +14,16 @@ ``` 2. Install necessary packages + - For Raspbian Stretch and lower: ```bash - apt-get -y install nginx php7.0-fpm php7.0-zip apache2-utils + apt-get -y install nginx php7.0-fpm php7.0-zip apache2-utils php7.0-sqlite + ``` + + - For Raspbian Buster: + + ```bash + apt-get -y install nginx php7.3-fpm php7.3-zip apache2-utils php7.3-sqlite ``` 3. Disable lighttpd at startup @@ -24,11 +33,18 @@ ``` 4. Enable php7.0-fpm at startup + - For Raspbian Stretch and lower: ```bash systemctl enable php7.0-fpm ``` + - For Raspbian Buster: + + ```bash + systemctl enable php7.3-fpm + ``` + 5. Enable nginx at startup ```bash @@ -101,10 +117,18 @@ 10. Start php7.0-fpm daemon + - For Raspbian Stretch and below: + ```bash service php7.0-fpm start ``` + - For Raspbian Buster: + + ```bash + service php7.3-fpm start + ``` + 11. Start nginx web server ```bash From 1710b6e3e60a3a8ad65ba1c72158b8d180034c06 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 24 Feb 2020 21:58:11 +0200 Subject: [PATCH 2/9] Update nginx-configuration.md Simplify things --- docs/guides/nginx-configuration.md | 35 +++++------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/docs/guides/nginx-configuration.md b/docs/guides/nginx-configuration.md index 15007544..29b6b230 100644 --- a/docs/guides/nginx-configuration.md +++ b/docs/guides/nginx-configuration.md @@ -1,9 +1,8 @@ ### Notes & Warnings - **This is an unsupported configuration created by the community** -- If you're using Raspbian Buster (debian 10), then you should install 'php7.3-fpm' instead of v7.0, and change all instances of 'php7.0-fpm' to 'php7.3-fpm'. -- If you're using php5, change all instances of `php7.0-fpm` to `php5-fpm` and change `/run/php/php7.0-fpm.sock` to `/var/run/php5-fpm.sock` -- The `php7.0-sqlite` package must be installed otherwise Networking and Querying will throw an error that it can't access the database. +- **Replace `7.3` with the PHP version you installed, e.g. if you're using Raspbian Stretch (Debian 9) replace `7.3` with 7.0`.** +- The `php7.3-sqlite` package must be installed otherwise Networking and Querying will throw an error that it can't access the database. ### Basic requirements @@ -14,16 +13,9 @@ ``` 2. Install necessary packages - - For Raspbian Stretch and lower: ```bash - apt-get -y install nginx php7.0-fpm php7.0-zip apache2-utils php7.0-sqlite - ``` - - - For Raspbian Buster: - - ```bash - apt-get -y install nginx php7.3-fpm php7.3-zip apache2-utils php7.3-sqlite + apt-get -y install nginx php7.3-fpm php7.3-zip php7.3-sqlite apache2-utils ``` 3. Disable lighttpd at startup @@ -32,14 +24,7 @@ systemctl disable lighttpd ``` -4. Enable php7.0-fpm at startup - - For Raspbian Stretch and lower: - - ```bash - systemctl enable php7.0-fpm - ``` - - - For Raspbian Buster: +4. Enable php7.3-fpm at startup ```bash systemctl enable php7.3-fpm @@ -72,7 +57,7 @@ location ~ \.php$ { include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name; - fastcgi_pass unix:/run/php/php7.0-fpm.sock; + fastcgi_pass unix:/run/php/php7.3-fpm.sock; fastcgi_param FQDN true; auth_basic "Restricted"; # For Basic Auth auth_basic_user_file /etc/nginx/.htpasswd; # For Basic Auth @@ -115,15 +100,7 @@ chmod -R 755 /var/www/html ``` -10. Start php7.0-fpm daemon - - - For Raspbian Stretch and below: - - ```bash - service php7.0-fpm start - ``` - - - For Raspbian Buster: +10. Start php7.3-fpm daemon ```bash service php7.3-fpm start From 8e7114710d21f38bfcad11afc9265691ef428c11 Mon Sep 17 00:00:00 2001 From: Mahakam20000 Date: Wed, 26 Feb 2020 16:36:18 +0100 Subject: [PATCH 3/9] Revisioning DHCP port I'm fixing my mistake on the previous pull request DHCP port is 67 **udp protocol**, so I delete the tcp rule. It was useless. DHCP must assign the IP address, so we can't check the IP address of the source. If we do so, it simply will not work. --- docs/main/prerequesites.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/main/prerequesites.md b/docs/main/prerequesites.md index 269e2a89..2c7dd6cf 100644 --- a/docs/main/prerequesites.md +++ b/docs/main/prerequesites.md @@ -68,8 +68,7 @@ iptables -I INPUT 1 -s 127.0.0.0/8 -p tcp -m tcp --dport 53 -j ACCEPT iptables -I INPUT 1 -s 127.0.0.0/8 -p udp -m udp --dport 53 -j ACCEPT iptables -I INPUT 1 -s 192.168.0.0/16 -p tcp -m tcp --dport 53 -j ACCEPT iptables -I INPUT 1 -s 192.168.0.0/16 -p udp -m udp --dport 53 -j ACCEPT -iptables -I INPUT 1 -s 192.168.0.0/16 -p tcp -m tcp --dport 67 -j ACCEPT -iptables -I INPUT 1 -s 192.168.0.0/16 -p udp -m udp --dport 67 -j ACCEPT +iptables -I INPUT 1 -p udp -m udp --dport 67 -j ACCEPT iptables -I INPUT 1 -p tcp -m tcp --dport 4711:4720 -i lo -j ACCEPT iptables -I INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT ``` @@ -77,7 +76,7 @@ iptables -I INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT IP6Tables (IPv6) ```bash -ip6tables -I INPUT -s fe80::/10 -p udp -m udp --sport 546:547 --dport 546:547 -j ACCEPT +ip6tables -I INPUT -p udp -m udp --sport 546:547 --dport 546:547 -j ACCEPT ip6tables -I INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT ``` From e98ab758251017aff31c5571bb0d0a3fe64b5c22 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sun, 1 Mar 2020 00:21:07 -0800 Subject: [PATCH 4/9] Update docs/main/prerequesites.md --- docs/main/prerequesites.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/main/prerequesites.md b/docs/main/prerequesites.md index 2c7dd6cf..dc04e303 100644 --- a/docs/main/prerequesites.md +++ b/docs/main/prerequesites.md @@ -68,7 +68,7 @@ iptables -I INPUT 1 -s 127.0.0.0/8 -p tcp -m tcp --dport 53 -j ACCEPT iptables -I INPUT 1 -s 127.0.0.0/8 -p udp -m udp --dport 53 -j ACCEPT iptables -I INPUT 1 -s 192.168.0.0/16 -p tcp -m tcp --dport 53 -j ACCEPT iptables -I INPUT 1 -s 192.168.0.0/16 -p udp -m udp --dport 53 -j ACCEPT -iptables -I INPUT 1 -p udp -m udp --dport 67 -j ACCEPT +iptables -I INPUT 1 -p udp --dport 67:68 --sport 67:68 -j ACCEPT iptables -I INPUT 1 -p tcp -m tcp --dport 4711:4720 -i lo -j ACCEPT iptables -I INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT ``` From 6ed763042be06e6f8b17218f7171b1e45f398b41 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 17 Apr 2020 09:17:03 +0300 Subject: [PATCH 5/9] Update mkdocs-material to v5.1.0 (#275) --- mkdocs.yml | 6 ++++-- requirements.txt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 770d2f82..d64f1994 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -6,6 +6,8 @@ copyright: 'Copyright © 2019 Pi-hole LLC' remote_branch: gh-pages theme: name: 'material' +# icon: +# repo: fontawesome/brands/github-alt favicon: 'images/favicon.ico' logo: 'images/logo.svg' language: 'en' @@ -111,9 +113,9 @@ nav: extra: social: - - type: globe + - icon: fontawesome/solid/globe-americas link: https://pi-hole.net/ - - type: github-alt + - icon: fontawesome/brands/github link: https://github.com/pi-hole extra_css: diff --git a/requirements.txt b/requirements.txt index 121c5987..e09d48a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ markdown-include==0.5.1 mkdocs==1.1 mkdocs-git-revision-date-localized-plugin==0.5.0 -mkdocs-material==4.6.3 +mkdocs-material==5.1.0 From 7e54c0d85a0f356ea61f990dae3e9804ae1d9eb7 Mon Sep 17 00:00:00 2001 From: stevedrz <51426708+stevedrz@users.noreply.github.com> Date: Fri, 17 Apr 2020 06:54:36 -0400 Subject: [PATCH 6/9] Add information on 1.1.1.1 for Families Added info on 1.1.1.1 for Families, including a blog link to explain the service. --- docs/guides/upstream-dns-providers.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/guides/upstream-dns-providers.md b/docs/guides/upstream-dns-providers.md index 2dba3263..30620ed0 100644 --- a/docs/guides/upstream-dns-providers.md +++ b/docs/guides/upstream-dns-providers.md @@ -91,6 +91,22 @@ CloudFlare will never log your IP address (the way other companies identify you) [More information on Cloudflare DNS](https://cloudflare-dns.com/dns/#explanation) +Cloudflare also provides 1.1.1.1 for Families, a set of resolvers that can block malware only, or malware and adult content. + +Malware Blocking Only +- 1.1.1.2 +- 1.0.0.2 +- 2606:4700:4700::1112 (IPv6) +- 2606:4700:4700::1002 (IPv6) + +Malware and Adult Content +- 1.1.1.3 +- 1.0.0.3 +- 2606:4700:4700::1113 (IPv6) +- 2606:4700:4700::1003 (IPv6) + +[More info on 1.1.1.1 for Families(https://blog.cloudflare.com/introducing-1-1-1-1-for-families/)] + ### Custom With custom, you'll choose your favorite DNS provider. If you care about Internet independence and privacy, we suggest having a look at the [OpenNIC DNS Project](https://servers.opennic.org/). From 2a90ebb8df84067ea15cbab6dd8d5ca1a379a4d6 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Fri, 17 Apr 2020 16:51:33 -0700 Subject: [PATCH 7/9] Update docs/guides/upstream-dns-providers.md --- docs/guides/upstream-dns-providers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/upstream-dns-providers.md b/docs/guides/upstream-dns-providers.md index 30620ed0..9a911ac8 100644 --- a/docs/guides/upstream-dns-providers.md +++ b/docs/guides/upstream-dns-providers.md @@ -105,7 +105,7 @@ Malware and Adult Content - 2606:4700:4700::1113 (IPv6) - 2606:4700:4700::1003 (IPv6) -[More info on 1.1.1.1 for Families(https://blog.cloudflare.com/introducing-1-1-1-1-for-families/)] +[More info on 1.1.1.1 for Families](https://blog.cloudflare.com/introducing-1-1-1-1-for-families/) ### Custom From 007e9cba35ecc4a30833c56d9b8a89977ccb894e Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Fri, 17 Apr 2020 16:53:52 -0700 Subject: [PATCH 8/9] Update docs/guides/upstream-dns-providers.md --- docs/guides/upstream-dns-providers.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/guides/upstream-dns-providers.md b/docs/guides/upstream-dns-providers.md index 9a911ac8..9275ad1b 100644 --- a/docs/guides/upstream-dns-providers.md +++ b/docs/guides/upstream-dns-providers.md @@ -94,12 +94,14 @@ CloudFlare will never log your IP address (the way other companies identify you) Cloudflare also provides 1.1.1.1 for Families, a set of resolvers that can block malware only, or malware and adult content. Malware Blocking Only + - 1.1.1.2 - 1.0.0.2 - 2606:4700:4700::1112 (IPv6) - 2606:4700:4700::1002 (IPv6) Malware and Adult Content + - 1.1.1.3 - 1.0.0.3 - 2606:4700:4700::1113 (IPv6) From fe06c15ec8086e4ba8da80d877ac5278a3dbb325 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 18 Apr 2020 06:56:17 +0000 Subject: [PATCH 9/9] Bump mkdocs-material from 5.1.0 to 5.1.1 Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 5.1.0 to 5.1.1. - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/5.1.0...5.1.1) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e09d48a0..f3047238 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ markdown-include==0.5.1 mkdocs==1.1 mkdocs-git-revision-date-localized-plugin==0.5.0 -mkdocs-material==5.1.0 +mkdocs-material==5.1.1