diff --git a/.gitignore b/.gitignore index 75d5e8b..003a0ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -block.list -*.list.old +/*.list.old +/block.list +/update.cfg diff --git a/README.md b/README.md index 9f21f3d..8f9f2e1 100644 --- a/README.md +++ b/README.md @@ -59,8 +59,13 @@ static domain_name_servers=127.0.0.1 ## License Copyright (C) 2021-2022 Dan Church. + License GPLv3: GNU GPL version 3.0 (https://www.gnu.org/licenses/gpl-3.0.html) + with Commons Clause 1.0 (https://commonsclause.com/). + This is free software: you are free to change and redistribute it. + There is NO WARRANTY, to the extent permitted by law. + You may NOT use this software for commercial purposes. diff --git a/lists/.gitignore b/lists/.gitignore new file mode 100644 index 0000000..f59469d --- /dev/null +++ b/lists/.gitignore @@ -0,0 +1,7 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore +# ... And some others +!/AdroitAdorKhan-core.hosts +!/custom-ad-domains.domains diff --git a/lists/.gitkeep b/lists/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/update.cfg.example b/update.cfg.example index f5a4f52..fcda8c6 100644 --- a/update.cfg.example +++ b/update.cfg.example @@ -17,13 +17,26 @@ #BACKUPSUFFIX= #BLOCKLIST=$WORKDIR/block.list #LIST_DIR=$WORKDIR/lists + +# Simple URL grab list +# Mirror any URL to the 'lists' directory. +# Note: URL and OUT indices are correlated, e.g. URL[10] will be retrieved and +# stored in OUT[10] +# Example config: +# URL+=('https://example.com/mylist.hosts') +# OUT+=("$LIST_DIR/mylist.hosts") +# URL+=('https://example.com/others.hosts') +# OUT+=("$LIST_DIR/others.hosts") #OUT=() #URL=() -# Individual hosts lists in that collection -#OUT+=("$LIST_DIR/sb-Badd-Boyz-Hosts.hosts") -#URL+=('https://raw.githubusercontent.com/StevenBlack/hosts/master/data/Badd-Boyz-Hosts/hosts') - -# Not sure how I'm supposed to update this file... -#OUT+=("$LIST_DIR/list.1.raw.githubusercontent.com.domains") -#URL+=('???') +# What to run in order to restart dnsmasq. Leave empty to restart manually. +# Note: if you need shell features, use (bash -c '...') +# Typical value: +# Ubuntu/Debian/CentOS: +# DNSMASQ_RESTART_COMMAND=(service dnsmasq restart) +# Slackware: +# DNSMASQ_RESTART_COMMAND=(/etc/rc.d/rc.dnsmasq restart) +# Mac OSX (with homebrew): +# DNSMASQ_RESTART_COMMAND=(brew services restart dnsmasq) +#DNSMASQ_RESTART_COMMAND=() diff --git a/update.sh b/update.sh index 9ec6543..81b68f5 100755 --- a/update.sh +++ b/update.sh @@ -25,6 +25,7 @@ BLOCKLIST=$WORKDIR/block.list LIST_DIR=$WORKDIR/lists OUT=() URL=() +DNSMASQ_RESTART_COMMAND=() if [[ -f $CFG ]]; then . "$CFG" fi @@ -90,6 +91,6 @@ if [[ -n $BACKUPSUFFIX && -f $BLOCKLIST$BACKUPSUFFIX ]]; then fi fi -if [[ -x /etc/rc.d/rc.dnsmasq ]]; then - /etc/rc.d/rc.dnsmasq restart +if [[ ${#DNSMASQ_RESTART_COMMAND[@]} -gt 0 ]]; then + "${DNSMASQ_RESTART_COMMAND[@]}" fi