diff --git a/.gitignore b/.gitignore index 003a0ef..75d5e8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/*.list.old -/block.list -/update.cfg +block.list +*.list.old diff --git a/README.md b/README.md index 8f9f2e1..9f21f3d 100644 --- a/README.md +++ b/README.md @@ -59,13 +59,8 @@ 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 deleted file mode 100644 index f59469d..0000000 --- a/lists/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# 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 new file mode 100644 index 0000000..e69de29 diff --git a/update.cfg.example b/update.cfg.example index fcda8c6..f5a4f52 100644 --- a/update.cfg.example +++ b/update.cfg.example @@ -17,26 +17,13 @@ #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=() -# 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=() +# 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+=('???') diff --git a/update.sh b/update.sh index 81b68f5..9ec6543 100755 --- a/update.sh +++ b/update.sh @@ -25,7 +25,6 @@ BLOCKLIST=$WORKDIR/block.list LIST_DIR=$WORKDIR/lists OUT=() URL=() -DNSMASQ_RESTART_COMMAND=() if [[ -f $CFG ]]; then . "$CFG" fi @@ -91,6 +90,6 @@ if [[ -n $BACKUPSUFFIX && -f $BLOCKLIST$BACKUPSUFFIX ]]; then fi fi -if [[ ${#DNSMASQ_RESTART_COMMAND[@]} -gt 0 ]]; then - "${DNSMASQ_RESTART_COMMAND[@]}" +if [[ -x /etc/rc.d/rc.dnsmasq ]]; then + /etc/rc.d/rc.dnsmasq restart fi