Merge branch 'develop'

This commit is contained in:
robocopAlpha 2021-07-21 06:40:54 +03:00
commit 50047c2bab
3 changed files with 3 additions and 4 deletions

View file

@ -23,8 +23,7 @@ if [[ -d "${HOME_DIR}/dropbox" ]]; then
else
mkdir "${HOME_DIR}/dropbox"
fi
rclone mount --daemon dropbox:blocklist "${HOME_DIR}/dropbox" --volname dropbox
rclone mount --daemon dropbox:blocklist "${HOME_DIR}/dropbox" --volname dropbox || { echo "Failed to mount dropbox. Execution terminated!"; exit 1; }
cd "${WRK_DIR}/"
echo $(date +%d.%m.%y-%H:%M:%S) >| lastpull

View file

@ -65,7 +65,7 @@ exit
sudo -s
ln -s /home/dietpi/pihole_lists/pull.lists.sh /usr/local/bin/pullLists
chmod +x /usr/local/bin/pullLists
echo '5 4 * * * root PATH="/home/linuxbrew/.linuxbrew/bin:/usr/sbin:/usr/local/bin/:$PATH" pullLists >| /home/dietpi/pihole_lists/cron_upd.log || cat /home/dietpi/pihole_lists/cron_upd.log' >| /etc/cron.d/pullLists
echo '30 3 * * * root PATH="/home/linuxbrew/.linuxbrew/bin:/usr/sbin:/usr/local/bin/:$PATH" pullLists >| /home/dietpi/pihole_lists/cron_upd.log || cat /home/dietpi/pihole_lists/cron_upd.log' >| /etc/cron.d/pullLists
exit
```

View file

@ -38,7 +38,7 @@ if [ ! -f "$LOGFILE" ] ; then
fi
echo "pihole being udpdated on: $(date)" | tee -a "$LOGFILE"
curl -L 'https://www.dropbox.com/sh/oyjii6ndqduixt8/AADn57717lc0TE4AW5dxB0p4a?dl=1' --output ./blocklist.zip && unzip -o ./blocklist.zip
curl -L 'https://www.dropbox.com/sh/oyjii6ndqduixt8/AADn57717lc0TE4AW5dxB0p4a?dl=1' --output ./blocklist.zip && unzip -o ./blocklist.zip -x /
rm ./blocklist.zip
xz -fd MyBlocklist.txt.xz
xz -fd facebook_block.txt.xz