query logging admin variable needed

4 files changed, 9 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03891bc0a330..08a9dd827fd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pi-hole-standalone
 	pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch alteration for standalone PC.
 	pkgver = 5.2.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/pi-hole/pi-hole
 	install = pi-hole-standalone.install
 	arch = any
@@ -15,7 +15,7 @@ pkgbase = pi-hole-standalone
 	conflicts = pi-hole-server
 	backup = etc/dnsmasq.d/01-pihole.conf
 	source = pi-hole-standalone-core-5.2.4.tar.gz::https://github.com/pi-hole/pi-hole/archive/v5.2.4.tar.gz
-	source = arch-server-core-5.2.4-007072726.patch::https://raw.githubusercontent.com/max72bra/pi-hole-standalone-archlinux-customization/master/arch-server-core-5.2.4.patch
+	source = arch-server-core-5.2.4-566364222.patch::https://raw.githubusercontent.com/max72bra/pi-hole-standalone-archlinux-customization/master/arch-server-core-5.2.4.patch
 	source = dnsmasq.include
 	source = pi-hole.tmpfile
 	source = pi-hole-gravity.service
@@ -33,7 +33,7 @@ pkgbase = pi-hole-standalone
 	sha256sums = 5228b4f923eab7784952a0fd6da895e7bff2f80a7f91c4a7c6350491dfdbb2e8
 	sha256sums = 88e3c78bbeaf5dc1100df65202ded8207877954a96bdf1b0ab3d9990d9fa759f
 	sha256sums = ff507ce58c9492cce57e947696e1b814469fc2d856a1e303c6e68f98c62ebf46
-	sha256sums = 8119a46428bdbe00a312b14f3f0c364248b120f2569c9f2b6af2ef1a64fdfe94
+	sha256sums = 2039755530379ed25a2c0f0ebac32d52f2743004c733ee1cddb2aec1e7e60d14
 	sha256sums = fa8d91d07b75f21076e5334c46d323cbc3dcf9a33fe9b8b4e032dbc5c979a6d2
 	sha256sums = 73a8362f7a3eac91c77efbbcb4910ff079203bb5f829e32ecf3391d017117bb8
 
diff --git a/PKGBUILD b/PKGBUILD
index efc4499d6ce5..73c8e427d110 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=pi-hole-standalone
 _pkgname=pi-hole
 pkgver=5.2.4
-pkgrel=2
+pkgrel=3
 _now=`date +%N`
 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch alteration for standalone PC.'
 arch=('any')
@@ -34,7 +34,7 @@ sha256sums=('550de24beae4d701c0486208083e06efa5476fb87a729fe39ddf7fc3cac83a75'
             '5228b4f923eab7784952a0fd6da895e7bff2f80a7f91c4a7c6350491dfdbb2e8'
             '88e3c78bbeaf5dc1100df65202ded8207877954a96bdf1b0ab3d9990d9fa759f'
             'ff507ce58c9492cce57e947696e1b814469fc2d856a1e303c6e68f98c62ebf46'
-            '8119a46428bdbe00a312b14f3f0c364248b120f2569c9f2b6af2ef1a64fdfe94'
+            '2039755530379ed25a2c0f0ebac32d52f2743004c733ee1cddb2aec1e7e60d14'
             'fa8d91d07b75f21076e5334c46d323cbc3dcf9a33fe9b8b4e032dbc5c979a6d2'
             '73a8362f7a3eac91c77efbbcb4910ff079203bb5f829e32ecf3391d017117bb8')
 
diff --git a/mimic_setupVars.conf.sh b/mimic_setupVars.conf.sh
index d163d46cb340..97f5c4556353 100644
--- a/mimic_setupVars.conf.sh
+++ b/mimic_setupVars.conf.sh
@@ -29,6 +29,7 @@ finalExports() {
     echo "PIHOLE_INTERFACE=${IPV4DEV}"
     echo "IPV4_ADDRESS=${IPV4_ADDRESS}"
     echo "IPV6_ADDRESS=${IPV6_ADDRESS}"
+    echo "QUERY_LOGGING=true"
     }>> "${setupVars}"
 }
 
diff --git a/pi-hole-standalone.install b/pi-hole-standalone.install
index 62f0c469f615..3fde50634395 100644
--- a/pi-hole-standalone.install
+++ b/pi-hole-standalone.install
@@ -24,6 +24,9 @@ post_upgrade() {
   # update owner of existing dir and file
   chown pihole:pihole /etc/pihole
 
+  # query logging disabling needs this
+  grep -qxF 'QUERY_LOGGING=' /etc/pihole/setupVars.conf || echo 'QUERY_LOGGING=true' >> /etc/pihole/setupVars.conf
+
   # warning
 
   # keep pacman from throwing errors should none them be on the filesystem