File 005_pi-hole_gitdir_to_datadir.patch of Package pi-hole

Overview Repositories Revisions Requests Users Attributes Meta

File 005_pi-hole_gitdir_to_datadir.patch of Package pi-hole (Revision e1b9adc82cefba5f28ea118dbf2f5fb8)

Currently displaying revision e1b9adc82cefba5f28ea118dbf2f5fb8 , Show latest

diff -uNr pi-hole-5.15.3.orig/advanced/Scripts/database_migration/gravity-db.sh pi-hole-5.15.3/advanced/Scripts/database_migration/gravity-db.sh
--- pi-hole-5.15.3.orig/advanced/Scripts/database_migration/gravity-db.sh	2023-01-27 15:16:54.278013104 +0100
+++ pi-hole-5.15.3/advanced/Scripts/database_migration/gravity-db.sh	2023-01-27 15:18:46.388021345 +0100
@@ -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="/usr/share/pi-hole/advanced/Scripts/database_migration/gravity"
 
 upgrade_gravityDB(){
 	local database piholeDir auditFile version
diff -uNr pi-hole-5.15.3.orig/advanced/Scripts/piholeCheckout.sh pi-hole-5.15.3/advanced/Scripts/piholeCheckout.sh
--- pi-hole-5.15.3.orig/advanced/Scripts/piholeCheckout.sh	2023-01-27 15:16:54.279013104 +0100
+++ pi-hole-5.15.3/advanced/Scripts/piholeCheckout.sh	2023-01-27 15:18:46.421021347 +0100
@@ -8,7 +8,7 @@
 # This file is copyright under the latest version of the EUPL.
 # Please see LICENSE file for your rights under this license.
 
-readonly PI_HOLE_FILES_DIR="/etc/.pihole"
+readonly PI_HOLE_FILES_DIR="/usr/share/pi-hole"
 SKIP_INSTALL="true"
 source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh"
 
diff -uNr pi-hole-5.15.3.orig/advanced/Scripts/piholeDebug.sh pi-hole-5.15.3/advanced/Scripts/piholeDebug.sh
--- pi-hole-5.15.3.orig/advanced/Scripts/piholeDebug.sh	2023-01-27 15:18:17.304019207 +0100
+++ pi-hole-5.15.3/advanced/Scripts/piholeDebug.sh	2023-01-27 15:18:46.425021347 +0100
@@ -56,7 +56,7 @@
 
 # Directories required by Pi-hole
 # https://discourse.pi-hole.net/t/what-files-does-pi-hole-use/1684
-CORE_GIT_DIRECTORY="/etc/.pihole"
+CORE_GIT_DIRECTORY="/usr/share/pi-hole"
 CRON_D_DIRECTORY="/etc/cron.d"
 DNSMASQ_D_DIRECTORY="/etc/dnsmasq.d"
 PIHOLE_DIRECTORY="/etc/pihole"
diff -uNr pi-hole-5.15.3.orig/advanced/Scripts/updatecheck.sh pi-hole-5.15.3/advanced/Scripts/updatecheck.sh
--- pi-hole-5.15.3.orig/advanced/Scripts/updatecheck.sh	2023-01-27 15:16:54.280013104 +0100
+++ pi-hole-5.15.3/advanced/Scripts/updatecheck.sh	2023-01-27 15:18:46.433021348 +0100
@@ -68,13 +68,13 @@
 
 # get Core versions
 
-CORE_VERSION="$(get_local_version /etc/.pihole)"
+CORE_VERSION="$(get_local_version /usr/share/pi-hole)"
 addOrEditKeyValPair "${VERSION_FILE}" "CORE_VERSION" "${CORE_VERSION}"
 
-CORE_BRANCH="$(get_local_branch /etc/.pihole)"
+CORE_BRANCH="$(get_local_branch /usr/share/pi-hole)"
 addOrEditKeyValPair "${VERSION_FILE}" "CORE_BRANCH" "${CORE_BRANCH}"
 
-CORE_HASH="$(get_local_hash /etc/.pihole)"
+CORE_HASH="$(get_local_hash /usr/share/pi-hole)"
 addOrEditKeyValPair "${VERSION_FILE}" "CORE_HASH" "${CORE_HASH}"
 
 GITHUB_CORE_VERSION="$(get_remote_version pi-hole)"
diff -uNr pi-hole-5.15.3.orig/advanced/Scripts/update.sh pi-hole-5.15.3/advanced/Scripts/update.sh
--- pi-hole-5.15.3.orig/advanced/Scripts/update.sh	2023-01-27 15:16:54.280013104 +0100
+++ pi-hole-5.15.3/advanced/Scripts/update.sh	2023-01-27 15:18:46.431021348 +0100
@@ -14,7 +14,7 @@
 readonly ADMIN_INTERFACE_GIT_URL="https://github.com/pi-hole/AdminLTE.git"
 readonly ADMIN_INTERFACE_DIR="/var/www/html/admin"
 readonly PI_HOLE_GIT_URL="https://github.com/pi-hole/pi-hole.git"
-readonly PI_HOLE_FILES_DIR="/etc/.pihole"
+readonly PI_HOLE_FILES_DIR="/usr/share/pi-hole"
 
 # shellcheck disable=SC2034
 SKIP_INSTALL=true
@@ -195,7 +195,7 @@
         echo ""
         echo -e "  ${INFO} Pi-hole core files out of date, updating local repo."
         getGitFiles "${PI_HOLE_FILES_DIR}" "${PI_HOLE_GIT_URL}"
-        echo -e "  ${INFO} If you had made any changes in '/etc/.pihole/', they have been stashed using 'git stash'"
+        echo -e "  ${INFO} If you had made any changes in '/usr/share/pi-hole/', they have been stashed using 'git stash'"
     fi
 
     if [[ "${web_update}" == true ]]; then
diff -uNr pi-hole-5.15.3.orig/advanced/Scripts/webpage.sh pi-hole-5.15.3/advanced/Scripts/webpage.sh
--- pi-hole-5.15.3.orig/advanced/Scripts/webpage.sh	2023-01-27 15:16:54.281013104 +0100
+++ pi-hole-5.15.3/advanced/Scripts/webpage.sh	2023-01-27 15:18:46.439021348 +0100
@@ -23,7 +23,7 @@
 readonly gravityDBfile="/etc/pihole/gravity.db"
 
 # Source install script for ${setupVars}, ${PI_HOLE_BIN_DIR} and valid_ip()
-readonly PI_HOLE_FILES_DIR="/etc/.pihole"
+readonly PI_HOLE_FILES_DIR="/usr/share/pi-hole"
 # shellcheck disable=SC2034  # used in basic-install to source the script without running it
 SKIP_INSTALL="true"
 source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh"
diff -uNr "pi-hole-5.15.3.orig/automated install/basic-install.sh" "pi-hole-5.15.3/automated install/basic-install.sh"
--- "pi-hole-5.15.3.orig/automated install/basic-install.sh"	2023-01-27 15:18:17.305019207 +0100
+++ "pi-hole-5.15.3/automated install/basic-install.sh"	2023-01-27 15:18:46.474021351 +0100
@@ -75,7 +75,7 @@
 webInterfaceGitUrl="https://github.com/pi-hole/AdminLTE.git"
 webInterfaceDir="${webroot}/admin"
 piholeGitUrl="https://github.com/pi-hole/pi-hole.git"
-PI_HOLE_LOCAL_REPO="/etc/.pihole"
+PI_HOLE_LOCAL_REPO="/usr/share/pi-hole"
 # List of pihole scripts, stored in an array
 PI_HOLE_FILES=(chronometer list piholeDebug piholeLogFlush setupLCD update version gravity uninstall webpage)
 # This directory is where the Pi-hole scripts will be installed
diff -uNr "pi-hole-5.15.3.orig/automated install/uninstall.sh" "pi-hole-5.15.3/automated install/uninstall.sh"
--- "pi-hole-5.15.3.orig/automated install/uninstall.sh"	2023-01-27 15:18:17.305019207 +0100
+++ "pi-hole-5.15.3/automated install/uninstall.sh"	2023-01-27 15:18:46.477021351 +0100
@@ -35,7 +35,7 @@
     fi
 fi
 
-readonly PI_HOLE_FILES_DIR="/etc/.pihole"
+readonly PI_HOLE_FILES_DIR="/usr/share/pi-hole"
 SKIP_INSTALL="true"
 source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh"
 # setupVars set in basic-install.sh
@@ -172,7 +172,7 @@
     ${SUDO} rm -rf /var/log/*pihole* &> /dev/null
     ${SUDO} rm -rf /var/log/pihole/*pihole* &> /dev/null
     ${SUDO} rm -rf /etc/pihole/ &> /dev/null
-    ${SUDO} rm -rf /etc/.pihole/ &> /dev/null
+    ${SUDO} rm -rf /usr/share/pi-hole/ &> /dev/null
     ${SUDO} rm -rf /usr/share/pi-hole/ &> /dev/null
     ${SUDO} rm -f /usr/bin/pihole &> /dev/null
     ${SUDO} rm -f /etc/bash_completion.d/pihole &> /dev/null
diff -uNr pi-hole-5.15.3.orig/gravity.sh pi-hole-5.15.3/gravity.sh
--- pi-hole-5.15.3.orig/gravity.sh	2023-01-27 15:18:17.306019207 +0100
+++ pi-hole-5.15.3/gravity.sh	2023-01-27 15:18:46.480021351 +0100
@@ -16,7 +16,7 @@
 coltable="/usr/share/pi-hole/COL_TABLE"
 source "${coltable}"
 # shellcheck disable=SC1091
-source "/etc/.pihole/advanced/Scripts/database_migration/gravity-db.sh"
+source "/usr/share/pi-hole/advanced/Scripts/database_migration/gravity-db.sh"
 
 basename="pihole"
 PIHOLE_COMMAND="/usr/bin/${basename}"
@@ -32,7 +32,7 @@
 localList="${piholeDir}/local.list"
 VPNList="/etc/openvpn/ipp.txt"
 
-piholeGitDir="/etc/.pihole"
+piholeGitDir="/usr/share/pi-hole"
 gravityDBfile_default="${piholeDir}/gravity.db"
 # GRAVITYDB may be overwritten by source pihole-FTL.conf below
 GRAVITYDB="${gravityDBfile_default}"
diff -uNr pi-hole-5.15.3.orig/pihole pi-hole-5.15.3/pihole
--- pi-hole-5.15.3.orig/pihole	2023-01-27 15:18:17.306019207 +0100
+++ pi-hole-5.15.3/pihole	2023-01-27 15:18:46.486021352 +0100
@@ -79,7 +79,7 @@
   if [ -n "${DOCKER_VERSION}" ]; then
     unsupportedFunc
   else
-    /etc/.pihole/automated\ install/basic-install.sh --reconfigure
+    /usr/share/pi-hole/automated\ install/basic-install.sh --reconfigure
     exit 0;
   fi
 }
diff -uNr pi-hole-5.15.3.orig/test/_centos_8.Dockerfile pi-hole-5.15.3/test/_centos_8.Dockerfile
--- pi-hole-5.15.3.orig/test/_centos_8.Dockerfile	2023-01-27 15:18:17.306019207 +0100
+++ pi-hole-5.15.3/test/_centos_8.Dockerfile	2023-01-27 15:18:46.491021352 +0100
@@ -1,7 +1,7 @@
 FROM quay.io/centos/centos:stream8
 RUN yum install -y git initscripts
 
-ENV GITDIR /etc/.pihole
+ENV GITDIR /usr/share/pi-hole
 ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
diff -uNr pi-hole-5.15.3.orig/test/_centos_9.Dockerfile pi-hole-5.15.3/test/_centos_9.Dockerfile
--- pi-hole-5.15.3.orig/test/_centos_9.Dockerfile	2023-01-27 15:18:17.306019207 +0100
+++ pi-hole-5.15.3/test/_centos_9.Dockerfile	2023-01-27 15:18:46.493021352 +0100
@@ -1,7 +1,7 @@
 FROM quay.io/centos/centos:stream9
 RUN yum install -y --allowerasing curl git initscripts
 
-ENV GITDIR /etc/.pihole
+ENV GITDIR /usr/share/pi-hole
 ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
diff -uNr pi-hole-5.15.3.orig/test/_debian_10.Dockerfile pi-hole-5.15.3/test/_debian_10.Dockerfile
--- pi-hole-5.15.3.orig/test/_debian_10.Dockerfile	2023-01-27 15:18:17.307019207 +0100
+++ pi-hole-5.15.3/test/_debian_10.Dockerfile	2023-01-27 15:18:46.495021352 +0100
@@ -1,6 +1,6 @@
 FROM buildpack-deps:buster-scm
 
-ENV GITDIR /etc/.pihole
+ENV GITDIR /usr/share/pi-hole
 ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
diff -uNr pi-hole-5.15.3.orig/test/_debian_11.Dockerfile pi-hole-5.15.3/test/_debian_11.Dockerfile
--- pi-hole-5.15.3.orig/test/_debian_11.Dockerfile	2023-01-27 15:18:17.307019207 +0100
+++ pi-hole-5.15.3/test/_debian_11.Dockerfile	2023-01-27 15:18:46.496021353 +0100
@@ -1,6 +1,6 @@
 FROM buildpack-deps:bullseye-scm
 
-ENV GITDIR /etc/.pihole
+ENV GITDIR /usr/share/pi-hole
 ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
diff -uNr pi-hole-5.15.3.orig/test/_fedora_36.Dockerfile pi-hole-5.15.3/test/_fedora_36.Dockerfile
--- pi-hole-5.15.3.orig/test/_fedora_36.Dockerfile	2023-01-27 15:18:17.307019207 +0100
+++ pi-hole-5.15.3/test/_fedora_36.Dockerfile	2023-01-27 15:18:46.498021353 +0100
@@ -1,7 +1,7 @@
 FROM fedora:36
 RUN dnf install -y git initscripts
 
-ENV GITDIR /etc/.pihole
+ENV GITDIR /usr/share/pi-hole
 ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
diff -uNr pi-hole-5.15.3.orig/test/_fedora_37.Dockerfile pi-hole-5.15.3/test/_fedora_37.Dockerfile
--- pi-hole-5.15.3.orig/test/_fedora_37.Dockerfile	2023-01-27 15:18:17.307019207 +0100
+++ pi-hole-5.15.3/test/_fedora_37.Dockerfile	2023-01-27 15:18:46.500021353 +0100
@@ -1,7 +1,7 @@
 FROM fedora:37
 RUN dnf install -y git initscripts
 
-ENV GITDIR /etc/.pihole
+ENV GITDIR /usr/share/pi-hole
 ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
diff -uNr pi-hole-5.15.3.orig/test/test_any_automated_install.py pi-hole-5.15.3/test/test_any_automated_install.py
--- pi-hole-5.15.3.orig/test/test_any_automated_install.py	2023-01-27 15:15:22.553006362 +0100
+++ pi-hole-5.15.3/test/test_any_automated_install.py	2023-01-27 15:18:46.512021354 +0100
@@ -333,7 +333,7 @@
     check_sudo = test_cmd.format("r", "/etc/cron.d/pihole", piholeuser)
     actual_rc = host.run(check_sudo).rc
     assert exit_status_success == actual_rc
-    directories = get_directories_recursive(host, "/etc/.pihole/")
+    directories = get_directories_recursive(host, "/usr/share/pi-hole/")
     for directory in directories:
         check_pihole = test_cmd.format("r", directory, piholeuser)
         actual_rc = host.run(check_pihole).rc
diff -uNr pi-hole-5.15.3.orig/test/_ubuntu_20.Dockerfile pi-hole-5.15.3/test/_ubuntu_20.Dockerfile
--- pi-hole-5.15.3.orig/test/_ubuntu_20.Dockerfile	2023-01-27 15:18:17.307019207 +0100
+++ pi-hole-5.15.3/test/_ubuntu_20.Dockerfile	2023-01-27 15:18:46.501021353 +0100
@@ -1,6 +1,6 @@
 FROM buildpack-deps:focal-scm
 
-ENV GITDIR /etc/.pihole
+ENV GITDIR /usr/share/pi-hole
 ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
diff -uNr pi-hole-5.15.3.orig/test/_ubuntu_22.Dockerfile pi-hole-5.15.3/test/_ubuntu_22.Dockerfile
--- pi-hole-5.15.3.orig/test/_ubuntu_22.Dockerfile	2023-01-27 15:18:17.307019207 +0100
+++ pi-hole-5.15.3/test/_ubuntu_22.Dockerfile	2023-01-27 15:18:46.503021353 +0100
@@ -1,6 +1,6 @@
 FROM buildpack-deps:jammy-scm
 
-ENV GITDIR /etc/.pihole
+ENV GITDIR /usr/share/pi-hole
 ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole

Places

File 005_pi-hole_gitdir_to_datadir.patch of Package pi-hole (Revision e1b9adc82cefba5f28ea118dbf2f5fb8)

Places