|
|
|
@ -238,18 +238,18 @@ trust-anchor=.,20326,8,2,E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC68345710423
|
|
|
|
|
# 168.192.in-addr.arpa to 192.168.0.0/16
|
|
|
|
|
# 192.in-addr.arpa to 192.0.0.0/8
|
|
|
|
|
if [[ "${CONDITIONAL_FORWARDING_REVERSE}" == *"in-addr.arpa" ]];then
|
|
|
|
|
arrRev=("${CONDITIONAL_FORWARDING_REVERSE//./ }")
|
|
|
|
|
case ${#arrRev[@]} in
|
|
|
|
|
arrRev=("${CONDITIONAL_FORWARDING_REVERSE//./ }")
|
|
|
|
|
case ${#arrRev[@]} in
|
|
|
|
|
6 ) REV_SERVER_CIDR="${arrRev[3]}.${arrRev[2]}.${arrRev[1]}.${arrRev[0]}/32";;
|
|
|
|
|
5 ) REV_SERVER_CIDR="${arrRev[2]}.${arrRev[1]}.${arrRev[0]}.0/24";;
|
|
|
|
|
4 ) REV_SERVER_CIDR="${arrRev[1]}.${arrRev[0]}.0.0/16";;
|
|
|
|
|
3 ) REV_SERVER_CIDR="${arrRev[0]}.0.0.0/8";;
|
|
|
|
|
3 ) REV_SERVER_CIDR="${arrRev[0]}.0.0.0/8";;
|
|
|
|
|
esac
|
|
|
|
|
else
|
|
|
|
|
# Set REV_SERVER_CIDR to whatever value it was set to
|
|
|
|
|
REV_SERVER_CIDR="${CONDITIONAL_FORWARDING_REVERSE}"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# If REV_SERVER_CIDR is not converted by the above, then use the REV_SERVER_TARGET variable to derive it
|
|
|
|
|
if [ -z "${REV_SERVER_CIDR}" ]; then
|
|
|
|
|
# Convert existing input to /24 subnet (preserves legacy behavior)
|
|
|
|
@ -636,8 +636,11 @@ Interfaces:
|
|
|
|
|
|
|
|
|
|
Teleporter() {
|
|
|
|
|
local datetimestamp
|
|
|
|
|
local host
|
|
|
|
|
datetimestamp=$(date "+%Y-%m-%d_%H-%M-%S")
|
|
|
|
|
php /var/www/html/admin/scripts/pi-hole/php/teleporter.php > "pi-hole-teleporter_${datetimestamp}.tar.gz"
|
|
|
|
|
host=$(hostname)
|
|
|
|
|
host="${host//./_}"
|
|
|
|
|
php /var/www/html/admin/scripts/pi-hole/php/teleporter.php > "pi-hole-${host:-noname}-teleporter_${datetimestamp}.tar.gz"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
checkDomain()
|
|
|
|
|