|
|
@ -36,9 +36,6 @@ blacklistFile="${piholeDir}/blacklist.txt"
|
|
|
|
regexFile="${piholeDir}/regex.list"
|
|
|
|
regexFile="${piholeDir}/regex.list"
|
|
|
|
adListFile="${piholeDir}/adlists.list"
|
|
|
|
adListFile="${piholeDir}/adlists.list"
|
|
|
|
|
|
|
|
|
|
|
|
localList="${piholeDir}/local.list"
|
|
|
|
|
|
|
|
VPNList="/etc/openvpn/ipp.txt"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
piholeGitDir="/etc/.pihole"
|
|
|
|
piholeGitDir="/etc/.pihole"
|
|
|
|
GRAVITYDB=$(getFTLConfigValue files.gravity)
|
|
|
|
GRAVITYDB=$(getFTLConfigValue files.gravity)
|
|
|
|
gravityDBschema="${piholeGitDir}/advanced/Templates/gravity.db.sql"
|
|
|
|
gravityDBschema="${piholeGitDir}/advanced/Templates/gravity.db.sql"
|
|
|
@ -299,12 +296,7 @@ migrate_to_database() {
|
|
|
|
|
|
|
|
|
|
|
|
# Determine if DNS resolution is available before proceeding
|
|
|
|
# Determine if DNS resolution is available before proceeding
|
|
|
|
gravity_CheckDNSResolutionAvailable() {
|
|
|
|
gravity_CheckDNSResolutionAvailable() {
|
|
|
|
local lookupDomain="pi.hole"
|
|
|
|
local lookupDomain="raw.githubusercontent.com"
|
|
|
|
|
|
|
|
|
|
|
|
# Determine if $localList does not exist, and ensure it is not empty
|
|
|
|
|
|
|
|
if [[ ! -e "${localList}" ]] || [[ -s "${localList}" ]]; then
|
|
|
|
|
|
|
|
lookupDomain="raw.githubusercontent.com"
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Determine if $lookupDomain is resolvable
|
|
|
|
# Determine if $lookupDomain is resolvable
|
|
|
|
if timeout 4 getent hosts "${lookupDomain}" &> /dev/null; then
|
|
|
|
if timeout 4 getent hosts "${lookupDomain}" &> /dev/null; then
|
|
|
@ -686,18 +678,6 @@ gravity_ShowCount() {
|
|
|
|
gravity_Table_Count "vw_regex_whitelist" "regex allowed filters"
|
|
|
|
gravity_Table_Count "vw_regex_whitelist" "regex allowed filters"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
# Create "localhost" entries into hosts format
|
|
|
|
|
|
|
|
gravity_generateLocalList() {
|
|
|
|
|
|
|
|
# Empty $localList if it already exists, otherwise, create it
|
|
|
|
|
|
|
|
echo "### Do not modify this file, it will be overwritten by pihole -g" > "${localList}"
|
|
|
|
|
|
|
|
chmod 644 "${localList}"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Add additional LAN hosts provided by OpenVPN (if available)
|
|
|
|
|
|
|
|
if [[ -f "${VPNList}" ]]; then
|
|
|
|
|
|
|
|
awk -F, '{printf $2"\t"$1".vpn\n"}' "${VPNList}" >> "${localList}"
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Trap Ctrl-C
|
|
|
|
# Trap Ctrl-C
|
|
|
|
gravity_Trap() {
|
|
|
|
gravity_Trap() {
|
|
|
|
trap '{ echo -e "\\n\\n ${INFO} ${COL_LIGHT_RED}User-abort detected${COL_NC}"; gravity_Cleanup "error"; }' INT
|
|
|
|
trap '{ echo -e "\\n\\n ${INFO} ${COL_LIGHT_RED}User-abort detected${COL_NC}"; gravity_Cleanup "error"; }' INT
|
|
|
@ -884,9 +864,6 @@ if ! gravity_DownloadBlocklists; then
|
|
|
|
exit 1
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
# Create local.list
|
|
|
|
|
|
|
|
gravity_generateLocalList
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Update gravity timestamp
|
|
|
|
# Update gravity timestamp
|
|
|
|
update_gravity_timestamp
|
|
|
|
update_gravity_timestamp
|
|
|
|
|
|
|
|
|
|
|
|