update to version 2.6.3

This commit is contained in:
diginc
2016-05-24 22:04:22 -05:00
parent ad6d4d79d0
commit cb266e3946
5 changed files with 7 additions and 7 deletions

View File

@@ -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

View File

@@ -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

2
debian/start.sh vendored
View File

@@ -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

Submodule pi-hole updated: 3853997295...c03268707a

View File

@@ -1 +1 @@
v2.6.2
v2.6.3