From 540ca1e31f74d54087c1b6357bdf59655622c202 Mon Sep 17 00:00:00 2001
From: LaboDJ <2527836+labodj@users.noreply.github.com>
Date: Sat, 3 Sep 2022 04:48:11 +0200
Subject: [PATCH] Remove the email function
It was removed from pi-hole in 5.12 by this PR https://github.com/pi-hole/pi-hole/pull/4870
Signed-off-by: LaboDJ <2527836+labodj@users.noreply.github.com>
---
README.md | 1 -
src/s6/debian-root/usr/local/bin/_startup.sh | 1 -
src/s6/debian-root/usr/local/bin/bash_functions.sh | 8 --------
3 files changed, 10 deletions(-)
diff --git a/README.md b/README.md
index 968f3f8..aaaef0d 100644
--- a/README.md
+++ b/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
(supports non-standard ports with `#[port number]`) e.g `127.0.0.1#5053;8.8.8.8;8.8.4.4`
(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
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 |
diff --git a/src/s6/debian-root/usr/local/bin/_startup.sh b/src/s6/debian-root/usr/local/bin/_startup.sh
index ff60bf2..2115461 100755
--- a/src/s6/debian-root/usr/local/bin/_startup.sh
+++ b/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
diff --git a/src/s6/debian-root/usr/local/bin/bash_functions.sh b/src/s6/debian-root/usr/local/bin/bash_functions.sh
index b3f5998..69d7838 100644
--- a/src/s6/debian-root/usr/local/bin/bash_functions.sh
+++ b/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
-}