Buck9195/pihole_lists
1
0
Fork 0
mirror of https://gitlab.com/robocopAlpha/pihole_lists.git synced 2026-05-17 18:42:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplified updates

Browse source 
as the idea is to generate blocklists daily, the update package will be downloaded daily without checksum. Easier this way.
Can implement checksum of the update package if needed.
This commit is contained in:
robocopAlpha 2021-07-16 03:40:56 +03:00
parent fb0c673e48
commit 4e52559f79
4 changed files with 25 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Links.txt
View file

@ -1,14 +1,13 @@
# dump.whitelist
https://gitlab.com/robocopAlpha/pihole_lists/-/raw/main/whitelist.txt
# Facebook checksum
https://www.dropbox.com/s/dl/bxwqegi7umy4io1/facebook_block.checksum
# blocklist pack
https://www.dropbox.com/sh/oyjii6ndqduixt8/AADn57717lc0TE4AW5dxB0p4a?dl=1
# Facebook Blocklist
https://www.dropbox.com/s/dl/xrsg5gswmzfsdd9/facebook_block.txt.xz
# Blocklist checksum
https://www.dropbox.com/s/dl/78gc475jdil8cx7/MyBlocklist.checksum
# Blocklist
https://www.dropbox.com/s/dl/yh3y87ue0x3a8ac/MyBlocklist.txt.xz
sudo -s
curl -L "https://gitlab.com/robocopAlpha/pihole_lists/-/raw/master/update.pi.sh" >| /usr/local/bin/updatepi
chmod +x /usr/local/bin/updatepi
echo '5 3 * * * root PATH="$PATH:/usr/sbin:/usr/local/bin/" updatepi' >| /etc/cron.d/updatepi
exit

4
pull.lists.sh
View file

@ -51,8 +51,8 @@ mv facebook_block.txt blocklists/.
# Archiving
echo "Compressing blocklists..."
cd "${WRK_DIR}/blocklists/"
getMD5 "MyBlocklist.txt" >| MyBlocklist.checksum
getMD5 "facebook_block.txt" >| facebook_block.checksum
# getMD5 "MyBlocklist.txt" >| MyBlocklist.checksum
# getMD5 "facebook_block.txt" >| facebook_block.checksum
sleep 1
xz -v -T4 MyBlocklist.txt
xz -v -T4 facebook_block.txt

22
set_env.sh
View file

@ -28,19 +28,19 @@ fi
#--- Set parameters based on Distribution
if [ "$(uname)" == "Darwin" ]; then
# echo "Setting params for Darwin..."
getMD5(){
# usage: getMD5 'filename' > outfile
echo "$(md5 -q ${1})"
}
# echo "Setting params for Darwin..."
# getMD5(){
# # usage: getMD5 'filename' > outfile
# echo "$(md5 -q ${1})"
# }
HOME_DIR=/Users/deepankar/OneDrive\ -\ O365\ Turun\ yliopisto/Git/Gitlab.DC
elif [ "$(uname)" == "Linux" ]; then
# echo "Setting params for Linux..."
getMD5()
{
# usage: getMD5 'filename' > outfile
echo "$(md5sum ${1} | cut -c -32)"
}
# echo "Setting params for Linux..."
# getMD5()
# {
# # usage: getMD5 'filename' > outfile
# echo "$(md5sum ${1} | cut -c -32)"
# }
HOME_DIR=/home/dietpi
else
echo "Only MacOS and Linux are supported."

24
update.pi.sh
View file

@ -38,25 +38,10 @@ if [ ! -f "$LOGFILE" ] ; then
fi
echo "pihole being udpdated on: $(date)" | tee -a "$LOGFILE"
chksum_web=$(curl -sL 'https://www.dropbox.com/s/dl/78gc475jdil8cx7/MyBlocklist.checksum')
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://www.dropbox.com/s/dl/yh3y87ue0x3a8ac/MyBlocklist.txt.xz'
xz -fd MyBlocklist.txt.xz
fi
chksum_web=$(curl -sL 'https://www.dropbox.com/s/dl/bxwqegi7umy4io1/facebook_block.checksum')
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://www.dropbox.com/s/dl/xrsg5gswmzfsdd9/facebook_block.txt.xz'
xz -fd facebook_block.txt.xz
fi
curl -L 'https://www.dropbox.com/sh/oyjii6ndqduixt8/AADn57717lc0TE4AW5dxB0p4a?dl=1' --output ./blocklist.zip && unzip ./blocklist.zip
rm ./blocklist.zip
xz -fd MyBlocklist.txt.xz
xz -fd facebook_block.txt.xz
curl -OJL 'https://gitlab.com/robocopAlpha/pihole_lists/-/raw/main/whitelist.txt'
grep "^[^#]" whitelist.txt | sort -u | uniq | tr '\r\n' ' ' >| whitelist
@ -64,6 +49,7 @@ 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
$(command -v pihole) updateGravity 2>&1 | tee -a "$LOGFILE"
# Add these to pihole adlist