Make blacklist honour pihole.conf file

advanced/Scripts/blacklist.sh

@@ -24,12 +24,15 @@ if [[ $# = 0 ]]; then
 fi
 
 #globals
-blacklist=/etc/pihole/blacklist.txt
+basename=pihole
-adList=/etc/pihole/gravity.list
+piholeDir=/etc/$basename
+adList=$piholeDir/gravity.list
+blacklist=$piholeDir/blacklist.txt
 reload=true
 addmode=true
 force=false
 versbose=true
+
 domList=()
 domToRemoveList=()
 
@@ -42,6 +45,12 @@ piholeIP=${piholeIPCIDR%/*}
 
 modifyHost=false
 
+# After setting defaults, check if there's local overrides
+if [[ -r $piholeDir/pihole.conf ]];then
+    echo "::: Local calibration requested..."
+        . $piholeDir/pihole.conf
+fi
+
 
 if [[ -f $piholeIPv6file ]];then
     # If the file exists, then the user previously chose to use IPv6 in the automated installer