diff -uprN pi-hole-6.0.6/adlists.list pi-hole-6.0.6.cust/adlists.list
--- pi-hole-6.0.6/adlists.list 1970-01-01 01:00:00.000000000 +0100
+++ pi-hole-6.0.6.cust/adlists.list 2025-03-30 19:04:09.565838590 +0200
@@ -0,0 +1,4 @@
+https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
+https://mirror1.malwaredomains.com/files/justdomains
+https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
+https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt
diff -uprN pi-hole-6.0.6/advanced/Scripts/database_migration/gravity-db.sh pi-hole-6.0.6.cust/advanced/Scripts/database_migration/gravity-db.sh
--- pi-hole-6.0.6/advanced/Scripts/database_migration/gravity-db.sh 2025-03-30 18:54:55.000000000 +0200
+++ pi-hole-6.0.6.cust/advanced/Scripts/database_migration/gravity-db.sh 2025-03-30 19:04:09.543259693 +0200
@@ -10,7 +10,7 @@
# This file is copyright under the latest version of the EUPL.
# Please see LICENSE file for your rights under this license.
-readonly scriptPath="/etc/.pihole/advanced/Scripts/database_migration/gravity"
+readonly scriptPath="/opt/pihole/database_migration/gravity"
upgrade_gravityDB(){
local database piholeDir version
diff -uprN pi-hole-6.0.6/advanced/Scripts/piholeARPTable.sh pi-hole-6.0.6.cust/advanced/Scripts/piholeARPTable.sh
--- pi-hole-6.0.6/advanced/Scripts/piholeARPTable.sh 2025-03-30 18:54:55.000000000 +0200
+++ pi-hole-6.0.6.cust/advanced/Scripts/piholeARPTable.sh 2025-03-30 19:04:09.521556214 +0200
@@ -32,7 +32,7 @@ flushARP(){
fi
# Stop FTL to prevent database access
- if ! output=$(service pihole-FTL stop 2>&1); then
+ if ! output=$(systemctl stop pihole-FTL 2>&1); then
echo -e "${OVER} ${CROSS} Failed to stop FTL"
echo " Output: ${output}"
return 1
@@ -64,7 +64,7 @@ flushARP(){
fi
# Start FTL again
- if ! output=$(service pihole-FTL restart 2>&1); then
+ if ! output=$(systemctl restart pihole-FTL 2>&1); then
echo -e "${OVER} ${CROSS} Failed to restart FTL"
echo " Output: ${output}"
return 1
diff -uprN pi-hole-6.0.6/advanced/Scripts/piholeLogFlush.sh pi-hole-6.0.6.cust/advanced/Scripts/piholeLogFlush.sh
--- pi-hole-6.0.6/advanced/Scripts/piholeLogFlush.sh 2025-03-30 18:54:55.000000000 +0200
+++ pi-hole-6.0.6.cust/advanced/Scripts/piholeLogFlush.sh 2025-03-30 19:04:09.555788742 +0200
@@ -29,7 +29,7 @@ fi
# Determine log file location
LOGFILE=$(getFTLConfigValue "files.log.dnsmasq")
if [ -z "$LOGFILE" ]; then
- LOGFILE="/var/log/pihole/pihole.log"
+ LOGFILE="/run/log/pihole/pihole.log"
fi
FTLFILE=$(getFTLConfigValue "files.log.ftl")
if [ -z "$FTLFILE" ]; then
@@ -38,13 +38,13 @@ fi
if [[ "$*" == *"once"* ]]; then
# Nightly logrotation
- if command -v /usr/sbin/logrotate >/dev/null; then
+ if command -v /usr/bin/logrotate >/dev/null; then
# Logrotate once
if [[ "$*" != *"quiet"* ]]; then
echo -ne " ${INFO} Running logrotate ..."
fi
- /usr/sbin/logrotate --force --state "${STATEFILE}" /etc/pihole/logrotate
+ /usr/bin/logrotate --force --state "${STATEFILE}" /etc/pihole/logrotate
else
# Copy pihole.log over to pihole.log.1
# and empty out pihole.log
diff -uprN pi-hole-6.0.6/advanced/Scripts/updatecheck.sh pi-hole-6.0.6.cust/advanced/Scripts/updatecheck.sh
--- pi-hole-6.0.6/advanced/Scripts/updatecheck.sh 2025-03-30 18:54:55.000000000 +0200
+++ pi-hole-6.0.6.cust/advanced/Scripts/updatecheck.sh 2025-03-30 19:04:09.519915839 +0200
@@ -68,13 +68,13 @@ fi
# get Core versions
-CORE_VERSION="$(get_local_version /etc/.pihole)"
+CORE_VERSION="6.0.6"
addOrEditKeyValPair "${VERSION_FILE}" "CORE_VERSION" "${CORE_VERSION}"
-CORE_BRANCH="$(get_local_branch /etc/.pihole)"
+CORE_BRANCH="master"
addOrEditKeyValPair "${VERSION_FILE}" "CORE_BRANCH" "${CORE_BRANCH}"
-CORE_HASH="$(get_local_hash /etc/.pihole)"
+CORE_HASH="builtfromreleasetarball"
addOrEditKeyValPair "${VERSION_FILE}" "CORE_HASH" "${CORE_HASH}"
GITHUB_CORE_VERSION="$(get_remote_version pi-hole "${CORE_BRANCH}")"
@@ -85,13 +85,13 @@ addOrEditKeyValPair "${VERSION_FILE}" "G
# get Web versions
-WEB_VERSION="$(get_local_version /var/www/html/admin)"
+WEB_VERSION="$(pacman -Q pi-hole-web | awk '{print $2}' | cut -d- -f1)"
addOrEditKeyValPair "${VERSION_FILE}" "WEB_VERSION" "${WEB_VERSION}"
-WEB_BRANCH="$(get_local_branch /var/www/html/admin)"
+WEB_BRANCH="master"
addOrEditKeyValPair "${VERSION_FILE}" "WEB_BRANCH" "${WEB_BRANCH}"
-WEB_HASH="$(get_local_hash /var/www/html/admin)"
+WEB_HASH="builtfromreleasetarball"
addOrEditKeyValPair "${VERSION_FILE}" "WEB_HASH" "${WEB_HASH}"
GITHUB_WEB_VERSION="$(get_remote_version web "${WEB_BRANCH}")"
diff -uprN pi-hole-6.0.6/advanced/Templates/logrotate pi-hole-6.0.6.cust/advanced/Templates/logrotate
--- pi-hole-6.0.6/advanced/Templates/logrotate 2025-03-30 18:54:55.000000000 +0200
+++ pi-hole-6.0.6.cust/advanced/Templates/logrotate 2025-03-30 19:04:09.546829134 +0200
@@ -1,4 +1,4 @@
-/var/log/pihole/pihole.log {
+/run/log/pihole/pihole.log {
# su #
daily
copytruncate
@@ -9,7 +9,7 @@
nomail
}
-/var/log/pihole/FTL.log {
+/run/log/pihole/FTL.log {
# su #
weekly
copytruncate
@@ -20,7 +20,7 @@
nomail
}
-/var/log/pihole/webserver.log {
+/run/log/pihole/webserver.log {
# su #
weekly
copytruncate
diff -uprN pi-hole-6.0.6/advanced/Templates/pihole.sudo pi-hole-6.0.6.cust/advanced/Templates/pihole.sudo
--- pi-hole-6.0.6/advanced/Templates/pihole.sudo 1970-01-01 01:00:00.000000000 +0100
+++ pi-hole-6.0.6.cust/advanced/Templates/pihole.sudo 2025-03-30 19:04:09.565372956 +0200
@@ -0,0 +1 @@
+pihole ALL=(ALL:ALL) NOPASSWD: /usr/bin/pihole
diff -uprN pi-hole-6.0.6/gravity.sh pi-hole-6.0.6.cust/gravity.sh
--- pi-hole-6.0.6/gravity.sh 2025-03-30 18:54:55.000000000 +0200
+++ pi-hole-6.0.6.cust/gravity.sh 2025-03-30 19:04:09.542242044 +0200
@@ -23,10 +23,10 @@ coltable="${PI_HOLE_SCRIPT_DIR}/COL_TABL
# shellcheck disable=SC1090
. "${coltable}"
# shellcheck disable=SC1091
-. "/etc/.pihole/advanced/Scripts/database_migration/gravity-db.sh"
+. "/opt/pihole/database_migration/gravity-db.sh"
basename="pihole"
-PIHOLE_COMMAND="/usr/local/bin/${basename}"
+PIHOLE_COMMAND="/usr/bin/${basename}"
piholeDir="/etc/${basename}"
@@ -42,8 +42,8 @@ adListFile="${piholeDir}/adlists.list"
piholeGitDir="/etc/.pihole"
GRAVITYDB=$(getFTLConfigValue files.gravity)
GRAVITY_TMPDIR=$(getFTLConfigValue files.gravity_tmp)
-gravityDBschema="${piholeGitDir}/advanced/Templates/gravity.db.sql"
-gravityDBcopy="${piholeGitDir}/advanced/Templates/gravity_copy.sql"
+gravityDBschema="/opt/pihole/gravity.db.sql"
+gravityDBcopy="/opt/pihole/gravity_copy.sql"
domainsExtension="domains"
curl_connect_timeout=10
diff -uprN pi-hole-6.0.6/pihole pi-hole-6.0.6.cust/pihole
--- pi-hole-6.0.6/pihole 2025-03-30 18:54:55.000000000 +0200
+++ pi-hole-6.0.6.cust/pihole 2025-03-30 19:04:09.544097310 +0200
@@ -97,25 +97,6 @@ arpFunc() {
exit 0
}
-updatePiholeFunc() {
- if [ -n "${DOCKER_VERSION}" ]; then
- unsupportedFunc
- else
- shift
- "${PI_HOLE_SCRIPT_DIR}"/update.sh "$@"
- exit 0
- fi
-}
-
-repairPiholeFunc() {
- if [ -n "${DOCKER_VERSION}" ]; then
- unsupportedFunc
- else
- /etc/.pihole/automated\ install/basic-install.sh --repair
- exit 0;
- fi
-}
-
updateGravityFunc() {
exec "${PI_HOLE_SCRIPT_DIR}"/gravity.sh "$@"
}
@@ -132,15 +113,6 @@ chronometerFunc() {
}
-uninstallFunc() {
- if [ -n "${DOCKER_VERSION}" ]; then
- unsupportedFunc
- else
- "${PI_HOLE_SCRIPT_DIR}"/uninstall.sh
- exit 0
- fi
-}
-
versionFunc() {
exec "${PI_HOLE_SCRIPT_DIR}"/version.sh
}
@@ -268,9 +240,9 @@ Example: 'pihole logging on'
Specify whether the Pi-hole log should be used
Options:
- on Enable the Pi-hole log at /var/log/pihole/pihole.log
- off Disable and flush the Pi-hole log at /var/log/pihole/pihole.log
- off noflush Disable the Pi-hole log at /var/log/pihole/pihole.log"
+ on Enable the Pi-hole log at /run/log/pihole/pihole.log
+ off Disable and flush the Pi-hole log at /run/log/pihole/pihole.log
+ off noflush Disable the Pi-hole log at /run/log/pihole/pihole.log"
exit 0
elif [[ "${1}" == "off" ]]; then
# Disable logging
@@ -396,59 +368,6 @@ tailFunc() {
exit 0
}
-piholeCheckoutFunc() {
- if [ -n "${DOCKER_VERSION}" ]; then
- echo -e "${CROSS} Function not supported in Docker images"
- echo "Please build a custom image following the steps at"
- echo "https://github.com/pi-hole/docker-pi-hole?tab=readme-ov-file#building-the-image-locally"
- exit 0
- else
- if [[ "$2" == "-h" ]] || [[ "$2" == "--help" ]]; then
- echo "Switch Pi-hole subsystems to a different GitHub branch
- Usage: ${COL_GREEN}pihole checkout${COL_NC} ${COL_YELLOW}shortcut${COL_NC}
- or ${COL_GREEN}pihole checkout${COL_NC} ${COL_PURPLE}repo${COL_NC} ${COL_CYAN}branch${COL_NC}
-
- Example: ${COL_GREEN}pihole checkout${COL_NC} ${COL_YELLOW}master${COL_NC}
- or ${COL_GREEN}pihole checkout${COL_NC} ${COL_PURPLE}ftl ${COL_CYAN}development${COL_NC}
-
- Shortcuts:
- ${COL_YELLOW}master${COL_NC} Update all subsystems to the latest stable release
- ${COL_YELLOW}dev${COL_NC} Update all subsystems to the latest development release
-
- Individual components:
- ${COL_PURPLE}core${COL_NC} ${COL_CYAN}branch${COL_NC} Change the branch of Pi-hole's core subsystem
- ${COL_PURPLE}web${COL_NC} ${COL_CYAN}branch${COL_NC} Change the branch of the web interface subsystem
- ${COL_PURPLE}ftl${COL_NC} ${COL_CYAN}branch${COL_NC} Change the branch of Pi-hole's FTL subsystem"
-
- exit 0
- fi
-
- source "${PI_HOLE_SCRIPT_DIR}"/piholeCheckout.sh
- shift
- checkout "$@"
- fi
-}
-
-tricorderFunc() {
- local tricorder_token
- if [[ ! -p "/dev/stdin" ]]; then
- echo -e " ${INFO} Please do not call Tricorder directly"
- exit 1
- fi
-
- tricorder_token=$(curl --silent --fail --show-error --upload-file "-" https://tricorder.pi-hole.net/upload < /dev/stdin 2>&1)
- if [[ "${tricorder_token}" != "https://tricorder.pi-hole.net/"* ]]; then
- echo -e "${CROSS} uploading failed, contact Pi-hole support for assistance."
- # Log curl error (if available)
- if [ -n "${tricorder_token}" ]; then
- echo -e "${INFO} Error message: ${COL_RED}${tricorder_token}${COL_NC}\\n"
- tricorder_token=""
- fi
- exit 1
- fi
- echo "Upload successful, your token is: ${COL_GREEN}${tricorder_token}${COL_NC}"
- exit 0
-}
updateCheckFunc() {
"${PI_HOLE_SCRIPT_DIR}"/updatecheck.sh "$@"
@@ -475,11 +394,7 @@ Domain Options:
Add '-h' for more info on allow/deny usage
Debugging Options:
- -d, debug Start a debugging session
- Add '-c' or '--check-database' to include a Pi-hole database integrity check
- Add '-a' to automatically upload the log to tricorder.pi-hole.net
-f, flush Flush the Pi-hole log
- -r, repair Repair Pi-hole subsystems
-t, tail [arg] View the live output of the Pi-hole log.
Add an optional argument to filter the log
(regular expressions are supported)
@@ -496,10 +411,8 @@ Options:
Add '-h' for more info on logging usage
-q, query Query the adlists for a specified domain
Add '-h' for more info on query usage
- -up, updatePihole Update Pi-hole subsystems
Add '--check-only' to exit script before update is performed.
-v, version Show installed versions of Pi-hole, Web Interface & FTL
- uninstall Uninstall Pi-hole from your system
status Display the running status of Pi-hole subsystems
enable Enable Pi-hole subsystems
Add '-h' for more info on enable usage
@@ -507,8 +420,6 @@ Options:
Add '-h' for more info on disable usage
reloaddns Update the lists and flush the cache without restarting the DNS server
reloadlists Update the lists WITHOUT flushing the cache or restarting the DNS server
- checkout Switch Pi-hole subsystems to a different GitHub branch
- Add '-h' for more info on checkout usage
arpflush Flush information stored in Pi-hole's network tables";
exit 0
}
@@ -525,7 +436,6 @@ case "${1}" in
"-c" | "chronometer" ) chronometerFunc "$@";;
"-q" | "query" ) queryFunc "$@";;
"status" ) statusFunc "$2";;
- "tricorder" ) tricorderFunc;;
# we need to add all arguments that require sudo power to not trigger the * argument
"allow" | "allowlist" ) need_root=0;;
@@ -535,18 +445,13 @@ case "${1}" in
"--allow-regex" | "allow-regex" ) need_root=0;;
"--allow-wild" | "allow-wild" ) need_root=0;;
"-f" | "flush" ) ;;
- "-up" | "updatePihole" ) ;;
- "-r" | "repair" ) ;;
"-l" | "logging" ) ;;
- "uninstall" ) ;;
"enable" ) need_root=0;;
"disable" ) need_root=0;;
- "-d" | "debug" ) ;;
"-g" | "updateGravity" ) ;;
"reloaddns" ) ;;
"reloadlists" ) ;;
"setpassword" ) ;;
- "checkout" ) ;;
"updatechecker" ) ;;
"arpflush" ) ;;
"-t" | "tail" ) ;;
@@ -576,19 +481,14 @@ case "${1}" in
"--regex" | "regex" ) listFunc "$@";;
"--allow-regex" | "allow-regex" ) listFunc "$@";;
"--allow-wild" | "allow-wild" ) listFunc "$@";;
- "-d" | "debug" ) debugFunc "$@";;
"-f" | "flush" ) flushFunc "$@";;
- "-up" | "updatePihole" ) updatePiholeFunc "$@";;
- "-r" | "repair" ) repairPiholeFunc;;
"-g" | "updateGravity" ) updateGravityFunc "$@";;
"-l" | "logging" ) piholeLogging "$@";;
- "uninstall" ) uninstallFunc;;
"enable" ) piholeEnable true "$2";;
"disable" ) piholeEnable false "$2";;
"reloaddns" ) reloadDNS "reload";;
"reloadlists" ) reloadDNS "reload-lists";;
"setpassword" ) SetWebPassword "$@";;
- "checkout" ) piholeCheckoutFunc "$@";;
"updatechecker" ) shift; updateCheckFunc "$@";;
"arpflush" ) arpFunc "$@";;
"-t" | "tail" ) tailFunc "$2";;