Merge branch 'master' into master

docs/guides/nginx-configuration.md

@@ -1,7 +1,8 @@
 ### Notes & Warnings
 
 - **This is an unsupported configuration created by the community**
-- 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`
+- **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,7 +15,7 @@
 2. Install necessary packages
 
     ```bash
-    apt-get -y install nginx php7.0-fpm php7.0-zip apache2-utils
+    apt-get -y install nginx php7.3-fpm php7.3-zip php7.3-sqlite apache2-utils
     ```
 
 3. Disable lighttpd at startup
@@ -23,10 +24,10 @@
     systemctl disable lighttpd
     ```
 
-4. Enable php7.0-fpm at startup
+4. Enable php7.3-fpm at startup
 
     ```bash
-    systemctl enable php7.0-fpm
+    systemctl enable php7.3-fpm
     ```
 
 5. Enable nginx at startup
@@ -56,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
@@ -99,10 +100,10 @@
     chmod -R 755 /var/www/html
     ```
 
-10. Start php7.0-fpm daemon
+10. Start php7.3-fpm daemon
 
     ```bash
-    service php7.0-fpm start
+    service php7.3-fpm start
     ```
 
 11. Start nginx web server

docs/guides/upstream-dns-providers.md

@@ -91,6 +91,24 @@ 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/).

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 --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
 ```
@@ -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
 ```
 

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:

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.1