diff --git a/alpine/gravity.sh b/alpine/gravity.sh index 1e768c0..3221939 100755 --- a/alpine/gravity.sh +++ b/alpine/gravity.sh @@ -27,7 +27,7 @@ else fi fi -piholeIPfile=/tmp/piholeIP +piholeIPfile=/etc/pihole/piholeIP piholeIPv6file=/etc/pihole/.useIPv6 adListFile=/etc/pihole/adlists.list @@ -38,7 +38,7 @@ blacklistScript=/opt/pihole/blacklist.sh if [[ -f $piholeIPfile ]];then # If the file exists, it means it was exported from the installation script and we should use that value instead of detecting it in this script piholeIP=$(cat $piholeIPfile) - rm $piholeIPfile + #rm $piholeIPfile else # Otherwise, the IP address can be taken directly from the machine, which will happen when the script is run by the user and not the installation script IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}') @@ -320,7 +320,7 @@ function gravity_reload() { if [[ $dnsmasqPid ]]; then # service already running - reload config - $SUDO kill -HUP "$dnsmasqPid" + $SUDO killall -s HUP dnsmasq else # service not running, start it up $SUDO dnsmasq -7 /etc/dnsmasq.d diff --git a/alpine/start.sh b/alpine/start.sh index f76db28..135c797 100755 --- a/alpine/start.sh +++ b/alpine/start.sh @@ -1,7 +1,7 @@ #!/bin/sh if [ -n "$ServerIP" ] ; then # /tmp/piholeIP is the current override of auto-lookup in gravity.sh - echo "$ServerIP" > /tmp/piholeIP; + echo "$ServerIP" > /etc/pihole/piholeIP; else echo "ERROR: To function correctly you must pass an environment variables of 'ServerIP' into the docker container with the IP of your docker host from which you are passing web (80) and dns (53) ports from" exit 1 diff --git a/debian/start.sh b/debian/start.sh index 9c80a4f..6e9817e 100755 --- a/debian/start.sh +++ b/debian/start.sh @@ -1,7 +1,7 @@ #!/bin/sh if [ -n "$ServerIP" ] ; then # /tmp/piholeIP is the current override of auto-lookup in gravity.sh - echo "$ServerIP" > /tmp/piholeIP; + echo "$ServerIP" > /etc/pihole/piholeIP; else echo "ERROR: It is required you pass an environment variables of 'ServerIP' with the IP of your docker host which you are passing 80/53 from" exit 1 diff --git a/pi-hole b/pi-hole index 3853997..c032687 160000 --- a/pi-hole +++ b/pi-hole @@ -1 +1 @@ -Subproject commit 38539972958fa66d21dd7cec1ec5c1141d4c85cb +Subproject commit c03268707a1f85bd3079c32c7fc3f43ae5702b5e diff --git a/pi-hole_version.txt b/pi-hole_version.txt index 382d9d4..ee6b06f 100644 --- a/pi-hole_version.txt +++ b/pi-hole_version.txt @@ -1 +1 @@ -v2.6.2 +v2.6.3