diff --git a/Links.txt b/Links.txt index ee713a2..c0563bc 100644 --- a/Links.txt +++ b/Links.txt @@ -1,5 +1,5 @@ # dump.whitelist -https://gitlab.com/robocopAlpha/pihole_lists/-/raw/main/whitelist +https://gitlab.com/robocopAlpha/pihole_lists/-/raw/main/whitelist.txt # Facebook checksum https://onedrive.live.com/download?cid=657437BB11E4A6E0&resid=657437BB11E4A6E0%2136851&authkey=AKpAocG7UzOq4tc diff --git a/update.pi.sh b/update.pi.sh index 12182a6..5804dd2 100755 --- a/update.pi.sh +++ b/update.pi.sh @@ -39,28 +39,28 @@ fi echo "pihole being udpdated on: $(date)" | tee -a "$LOGFILE" -chksum_web=$(curl -s https://gitlab.com/robocopAlpha/pihole_lists/-/raw/master/MyBlocklist.checksum) +chksum_web=$(curl -sL 'https://onedrive.live.com/download?cid=657437BB11E4A6E0&resid=657437BB11E4A6E0%2136854&authkey=AFJZ-x_h0FFAvug') chksum_local=$(md5sum MyBlocklist.txt | cut -c -32) if [ -f MyBlocklist.txt ] && [ "$chksum_web" == "$chksum_local" ]; then echo "${GREEN}MyBlocklist Unchanged. Skipping download.${NC}" 2>&1 | tee -a "$LOGFILE" else echo "${CYAN}Getting Myblocklist${NC}" 2>&1 | tee -a "$LOGFILE" - curl -OJL 'https://gitlab.com/robocopAlpha/pihole_lists/-/raw/master/MyBlocklist.txt.xz' + curl -OJL 'https://onedrive.live.com/download?cid=657437BB11E4A6E0&resid=657437BB11E4A6E0%2136855&authkey=AOZzJEs3AgYLJ2M' xz -fd MyBlocklist.txt.xz fi -chksum_web=$(curl -s https://gitlab.com/robocopAlpha/pihole_lists/-/raw/master/facebook_block.checksum) +chksum_web=$(curl -sL 'https://onedrive.live.com/download?cid=657437BB11E4A6E0&resid=657437BB11E4A6E0%2136851&authkey=AKpAocG7UzOq4tc') chksum_local=$(md5sum facebook_block.txt | cut -c -32) if [ "$chksum_web" == "$chksum_local" ] && [ -f facebook_block.txt ]; then echo "${GREEN}Facebook blocklist Unchanged. Skipping download.${NC}" 2>&1 | tee -a "$LOGFILE" else echo "${CYAN}Getting Facebook blocklist${NC}" 2>&1 | tee -a "$LOGFILE" - curl -OJL 'https://gitlab.com/robocopAlpha/pihole_lists/-/raw/master/facebook_block.txt.xz' + curl -OJL 'https://onedrive.live.com/download?cid=657437BB11E4A6E0&resid=657437BB11E4A6E0%2136852&authkey=ABtJvm-js7fgxi8' xz -fd facebook_block.txt.xz fi -curl -OJL 'https://gitlab.com/robocopAlpha/pihole_lists/-/raw/master/dump.whitelist.txt' -grep "^[^#]" dump.whitelist.txt | sort -u | uniq | tr '\r\n' ' ' > whitelist -rm -f dump.whitelist.txt +curl -OJL 'https://gitlab.com/robocopAlpha/pihole_lists/-/raw/main/whitelist.txt' +grep "^[^#]" whitelist.txt | sort -u | uniq | tr '\r\n' ' ' >| whitelist +rm -f whitelist.txt $(command -v pihole) -w --nuke > /dev/null 2>&1 | tee -a "$LOGFILE" $(command -v pihole) -w -q -nr $(cat whitelist) 2>&1 | tee -a "$LOGFILE" rm whitelist