daily autocommit

.etckeeper

@@ -98,6 +98,8 @@ maybe chmod 0444 '.pihole/.git/objects/pack/pack-7a2786ac307537f383ccb724df38dc1
 maybe chmod 0444 '.pihole/.git/objects/pack/pack-7a2786ac307537f383ccb724df38dc16e32de3e6.pack'
 maybe chmod 0444 '.pihole/.git/objects/pack/pack-c5b658a7bf94a1b9aa33c84549e17ab69492e489.idx'
 maybe chmod 0444 '.pihole/.git/objects/pack/pack-c5b658a7bf94a1b9aa33c84549e17ab69492e489.pack'
+maybe chmod 0444 '.pihole/.git/objects/pack/pack-d42e7eea59320ace43c61088704e4d62ab716bee.idx'
+maybe chmod 0444 '.pihole/.git/objects/pack/pack-d42e7eea59320ace43c61088704e4d62ab716bee.pack'
 maybe chmod 0644 '.pihole/.git/packed-refs'
 maybe chmod 0755 '.pihole/.git/refs'
 maybe chmod 0755 '.pihole/.git/refs/heads'
@@ -132,11 +134,12 @@ maybe chmod 0644 '.pihole/.git/refs/tags/v4.3.4'
 maybe chmod 0644 '.pihole/.git/refs/tags/v4.3.5'
 maybe chmod 0644 '.pihole/.git/refs/tags/v4.4'
 maybe chmod 0644 '.pihole/.git/refs/tags/v5.0'
+maybe chmod 0644 '.pihole/.git/refs/tags/v5.1'
+maybe chmod 0644 '.pihole/.git/refs/tags/v5.1.1'
+maybe chmod 0644 '.pihole/.git/refs/tags/v5.1.2'
 maybe chmod 0644 '.pihole/.git/shallow'
 maybe chmod 0644 '.pihole/.gitattributes'
 maybe chmod 0755 '.pihole/.github'
-maybe chmod 0644 '.pihole/.github/ISSUE_TEMPLATE.md'
-maybe chmod 0644 '.pihole/.github/PULL_REQUEST_TEMPLATE.md'
 maybe chmod 0644 '.pihole/.github/dco.yml'
 maybe chmod 0644 '.pihole/.gitignore'
 maybe chmod 0755 '.pihole/.idea'
@@ -174,6 +177,7 @@ maybe chmod 0644 '.pihole/advanced/Scripts/database_migration/gravity/7_to_8.sql
 maybe chmod 0644 '.pihole/advanced/Scripts/database_migration/gravity/8_to_9.sql'
 maybe chmod 0644 '.pihole/advanced/Scripts/database_migration/gravity/9_to_10.sql'
 maybe chmod 0755 '.pihole/advanced/Scripts/list.sh'
+maybe chmod 0755 '.pihole/advanced/Scripts/pihole-reenable.sh'
 maybe chmod 0755 '.pihole/advanced/Scripts/piholeARPTable.sh'
 maybe chmod 0644 '.pihole/advanced/Scripts/piholeCheckout.sh'
 maybe chmod 0755 '.pihole/advanced/Scripts/piholeDebug.sh'
@@ -205,9 +209,6 @@ maybe chmod 0755 '.pihole/automated install'
 maybe chmod 0755 '.pihole/automated install/basic-install.sh'
 maybe chmod 0755 '.pihole/automated install/uninstall.sh'
 maybe chmod 0755 '.pihole/autotest'
-maybe chmod 0755 '.pihole/block hulu ads'
-maybe chmod 0644 '.pihole/block hulu ads/lighttpd.conf'
-maybe chmod 0644 '.pihole/block hulu ads/minidlna.conf'
 maybe chmod 0755 '.pihole/gravity.sh'
 maybe chmod 0755 '.pihole/manpages'
 maybe chmod 0644 '.pihole/manpages/pihole-FTL.8'
@@ -216,6 +217,7 @@ maybe chmod 0644 '.pihole/manpages/pihole.8'
 maybe chmod 0755 '.pihole/pihole'
 maybe chmod 0644 '.pihole/requirements.txt'
 maybe chmod 0644 '.pihole/setup.py'
+maybe chmod 0644 '.pihole/supportedos.txt'
 maybe chmod 0755 '.pihole/test'
 maybe chmod 0644 '.pihole/test/README.md'
 maybe chmod 0644 '.pihole/test/__init__.py'
@@ -13946,6 +13948,7 @@ maybe chown 'pihole' 'pihole'
 maybe chgrp 'pihole' 'pihole'
 maybe chmod 0775 'pihole'
 maybe chmod 0644 'pihole/GitHubVersions'
+maybe chmod 0644 'pihole/adlists.list'
 maybe chmod 0644 'pihole/auditlog.list'
 maybe chmod 0644 'pihole/black.list'
 maybe chown 'pihole' 'pihole/dhcp.leases'

.pihole

@@ -1 +1 @@
-Subproject commit 4d25f695267590b61a4061f9bb43448005d99b85
+Subproject commit 6b536b7428a1f57ff34ddc444ded6d3a62b00a38

cron.d/pihole

@@ -10,7 +10,7 @@
 #
 #
 # This file is under source-control of the Pi-hole installation and update
-# scripts, any changes made to this file will be overwritten when the softare
+# scripts, any changes made to this file will be overwritten when the software
 # is updated or re-installed. Please make any changes to the appropriate crontab
 # or other cron file snippets.
 
@@ -18,19 +18,19 @@
 #          early morning. Download any updates from the adlists
 #          Squash output to log, then splat the log to stdout on error to allow for
 #          standard crontab job error handling.
-8 3   * * 7   root    PATH="$PATH:/usr/local/bin/" pihole updateGravity >/var/log/pihole_updateGravity.log || cat /var/log/pihole_updateGravity.log
+24 4   * * 7   root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updateGravity >/var/log/pihole_updateGravity.log || cat /var/log/pihole_updateGravity.log
 
 # Pi-hole: Flush the log daily at 00:00
 #          The flush script will use logrotate if available
 #          parameter "once": logrotate only once (default is twice)
 #          parameter "quiet": don't print messages
-00 00   * * *   root    PATH="$PATH:/usr/local/bin/" pihole flush once quiet
+00 00   * * *   root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole flush once quiet
 
 @reboot root /usr/sbin/logrotate /etc/pihole/logrotate
 
 # Pi-hole: Grab local version and branch every 10 minutes
-*/10 *  * * *   root    PATH="$PATH:/usr/local/bin/" pihole updatechecker local
+*/10 *  * * *   root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker local
 
 # Pi-hole: Grab remote version every 24 hours
-35 13  * * *   root    PATH="$PATH:/usr/local/bin/" pihole updatechecker remote
+18 16  * * *   root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker remote
-@reboot root    PATH="$PATH:/usr/local/bin/" pihole updatechecker remote reboot
+@reboot root    PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker remote reboot

init.d/pihole-FTL

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ### BEGIN INIT INFO
 # Provides:          pihole-FTL
-# Required-Start:    $remote_fs $syslog
+# Required-Start:    $remote_fs $syslog $network
-# Required-Stop:     $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog $network
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: pihole-FTL daemon
@@ -10,21 +10,10 @@
 ### END INIT INFO
 
 FTLUSER=pihole
-PIDFILE=/var/run/pihole-FTL.pid
+PIDFILE=/run/pihole-FTL.pid
-
-get_pid() {
-    # First, try to obtain PID from PIDFILE
-    if [ -s "${PIDFILE}" ]; then
-        cat "${PIDFILE}"
-        return
-    fi
-
-    # If the PIDFILE is empty or not available, obtain the PID using pidof
-    pidof "pihole-FTL" | awk '{print $(NF)}'
-}
 
 is_running() {
-    ps "$(get_pid)" > /dev/null 2>&1
+    pgrep -o "pihole-FTL" > /dev/null 2>&1
 }
 
 
@@ -37,12 +26,12 @@ start() {
     touch /var/log/pihole-FTL.log /var/log/pihole.log
     touch /run/pihole-FTL.pid /run/pihole-FTL.port
     touch /etc/pihole/dhcp.leases
-    mkdir -p /var/run/pihole
+    mkdir -p /run/pihole
     mkdir -p /var/log/pihole
-    chown pihole:pihole /var/run/pihole /var/log/pihole
+    chown pihole:pihole /run/pihole /var/log/pihole
     # Remove possible leftovers from previous pihole-FTL processes
     rm -f /dev/shm/FTL-* 2> /dev/null
-    rm /var/run/pihole/FTL.sock 2> /dev/null
+    rm /run/pihole/FTL.sock 2> /dev/null
     # Ensure that permissions are set so that pihole-FTL can edit all necessary files
     chown pihole:pihole /run/pihole-FTL.pid /run/pihole-FTL.port
     chown pihole:pihole /etc/pihole /etc/pihole/dhcp.leases 2> /dev/null
@@ -50,7 +39,7 @@ start() {
     chmod 0644 /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /var/log/pihole.log
     # Chown database files to the user FTL runs as. We ignore errors as the files may not (yet) exist
     chown pihole:pihole /etc/pihole/pihole-FTL.db /etc/pihole/gravity.db 2> /dev/null
-    if setcap CAP_NET_BIND_SERVICE,CAP_NET_RAW,CAP_NET_ADMIN+eip "$(which pihole-FTL)"; then
+    if setcap CAP_NET_BIND_SERVICE,CAP_NET_RAW,CAP_NET_ADMIN,CAP_SYS_NICE+eip "$(which pihole-FTL)"; then
       su -s /bin/sh -c "/usr/bin/pihole-FTL" "$FTLUSER"
     else
       echo "Warning: Starting pihole-FTL as root because setting capabilities is not supported on this system"
@@ -63,7 +52,7 @@ start() {
 # Stop the service
 stop() {
   if is_running; then
-    kill "$(get_pid)"
+    pkill -o pihole-FTL
     for i in {1..5}; do
       if ! is_running; then
         break
@@ -76,7 +65,7 @@ stop() {
 
     if is_running; then
       echo "Not stopped; may still be shutting down or shutdown may have failed, killing now"
-      kill -9 "$(get_pid)"
+      pkill -o -9 pihole-FTL
       exit 1
     else
       echo "Stopped"

pihole/adlists.list

@@ -0,0 +1,2 @@
+https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
+https://mirror1.malwaredomains.com/files/justdomains

pihole/localversions

@@ -1 +1 @@
-v5.0-0-g4d25f69 v5.0-0-gb86e4a3 v5.0
+v5.1.2-0-g6b536b7 v5.1.1-0-ga03d1bd v5.2

pihole/setupVars.conf

@@ -6,6 +6,7 @@ DNS_BOGUS_PRIV=false
 DNSSEC=false
 CONDITIONAL_FORWARDING=false
 HOSTRECORD=vpn.ovalwonder.com,10.3.14.92
+BLOCKING_ENABLED=true
 PIHOLE_INTERFACE=eth0
 IPV4_ADDRESS=10.3.14.92/10
 IPV6_ADDRESS=
@@ -15,4 +16,3 @@ QUERY_LOGGING=true
 INSTALL_WEB_SERVER=false
 INSTALL_WEB_INTERFACE=true
 LIGHTTPD_ENABLED=false
-BLOCKING_ENABLED=true

pihole/setupVars.conf.update.bak

@@ -1,18 +1,18 @@
 WEBPASSWORD=db7ee491a7432b842ef6fb2d7dd2cad174b223b9496da3552873dfb5cffc60fa
 TEMPERATUREUNIT=F
+DNSMASQ_LISTENING=local
+DNS_FQDN_REQUIRED=true
+DNS_BOGUS_PRIV=false
+DNSSEC=false
+CONDITIONAL_FORWARDING=false
+HOSTRECORD=vpn.ovalwonder.com,10.3.14.92
 PIHOLE_INTERFACE=eth0
 IPV4_ADDRESS=10.3.14.92/10
 IPV6_ADDRESS=
+PIHOLE_DNS_1=127.0.0.1#53
+PIHOLE_DNS_2=127.0.0.1#53
 QUERY_LOGGING=true
 INSTALL_WEB_SERVER=false
 INSTALL_WEB_INTERFACE=true
 LIGHTTPD_ENABLED=false
-DNSMASQ_LISTENING=local
-PIHOLE_DNS_1=127.0.0.1#53
-PIHOLE_DNS_2=127.0.0.1#53
-DNS_FQDN_REQUIRED=true
-DNS_BOGUS_PRIV=false
-DNSSEC=false
-CONDITIONAL_FORWARDING=false
-HOSTRECORD=vpn.ovalwonder.com,10.3.14.92
 BLOCKING_ENABLED=true