Merge pull request #1202 from pi-hole/dev

Dev

CONTRIBUTING.md

@@ -6,5 +6,5 @@ Please review the following before opening a pull request (PR) to help your PR g
   * To ensure proper testing and quality control, target any code change pull requests against `dev` branch.
 
 * Make sure the tests pass
-  * Take a look at [TESTING.md](TESTING.md) to see how to run tests locally so you do not have to push all your code to a PR and have GitHub Actions run it.
+  * Take a look at [TESTING.md](test/TESTING.md) to see how to run tests locally so you do not have to push all your code to a PR and have GitHub Actions run it.
   * Your tests will probably run faster locally and you get a faster feedback loop.

README.md

@@ -105,7 +105,6 @@ There are other environment variables if you want to customize various things in
 
 | Variable | Default | Value | Description |
 | -------- | ------- | ----- | ---------- |
-| `ADMIN_EMAIL` | unset | email address | Set an administrative contact address for the Block Page |
 | `PIHOLE_DNS_` |  `8.8.8.8;8.8.4.4` | IPs delimited by `;` | Upstream DNS server(s) for Pi-hole to forward queries to, separated by a semicolon <br/> (supports non-standard ports with `#[port number]`) e.g `127.0.0.1#5053;8.8.8.8;8.8.4.4` <br/> (supports [Docker service names and links](https://docs.docker.com/compose/networking/) instead of IPs) e.g `upstream0;upstream1` where `upstream0` and `upstream1` are the service names of or links to docker services <br/> Note: The existence of this environment variable assumes this as the _sole_ management of upstream DNS. Upstream DNS added via the web interface will be overwritten on container restart/recreation |
 | `DNSSEC` | `false` | `<"true"\|"false">` | Enable DNSSEC support |
 | `DNS_BOGUS_PRIV` | `true` |`<"true"\|"false">`| Never forward reverse lookups for private ranges |

src/s6/debian-root/usr/local/bin/_startup.sh

@@ -43,7 +43,6 @@ setup_lighttpd_bind
 
 # Misc Setup
 # ===========================
-setup_admin_email
 setup_blocklists
 
 # FTL setup

src/s6/debian-root/usr/local/bin/bash_functions.sh

@@ -524,11 +524,3 @@ setup_web_layout() {
       fi
   fi
 }
-
-setup_admin_email() {
-  local EMAIL="${ADMIN_EMAIL}"
-  # check if var is empty
-  if [[ "$EMAIL" != "" ]] ; then
-      pihole -a -e "$EMAIL"
-  fi
-}