pi-hole

Commit Graph

Author	SHA1	Message	Date
DL6ER	165affc39b	list.sh writes into blacklist.txt not black.list so does not need to account for a possibly changed list location Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	f794018e0c	Acknowledge temporary file if disabled for "pihole -b" command Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Mcat12	e4e22fb58e	Fix permissive regex The `\.?` is too permissive, letting in anything that ends in the domain Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	7086a400e8	Use simpler regex format for wildcards Use `\.?domain\.com$` instead of `((^)\|(\.))domain\.com$` Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Dan Schaper	3519cc5e44	Space/Tab list.sh Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Mcat12	f8d4c36f6d	Add back --wild list.sh help and use -- for long params like --regex Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	941a766aa3	Replace -wild and -regex with --wild and --regex Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	1b276a74fe	Display all lines of a list, even if there is no newline at the end Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	8084c4b2a3	Fix regex period substitution due to switching to bashism Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	1ca852191f	Fix stickler complaints Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	af5fc6547a	Fix echoing wrong domain when converting wildcard Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	70f2b26c86	Escape periods in wildcard converted regex filters. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	cfd95dbe87	Fix incorrect variable usage Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	c5bb404d6a	Emulate wildcard blacklisting via -wild and move regex to -regex Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	3077c22e4f	Change help strings from wildcard to regex blacklist Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	0decc37b5a	Appease stickler Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	4a953b66e0	Make removing regex domains work correctly Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	8435eeed4d	Don't validate regex domains Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	cffb4de83b	Use strict grep instead of regex for duplicates Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
DL6ER	d254d6075a	First step from wildcards to regex lists for blocking Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Ludovic Rousseau	47bbea9ba7	Use " " to protect parameter substitution Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
Ludovic Rousseau	b7891f92a5	Create blacklist.txt if not existant Closes: https://github.com/pi-hole/pi-hole/issues/1888 Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
Adam Warner	162a7b56fe	force mode is no longer referenced. Regression. Same with `domToRemoveList` Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
DL6ER	70ad656af0	Save backup as ".bck~" to prevent reading of the file by dnsmasq Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	f22b83d379	Create a backup before emptying the list Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	114f84c948	Add --nuke option to list.sh that can be used e.g. by Teleporter to empty out lists before importing new content Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
WaLLy3K	2d8fff099f	Pass correct options to gravity.sh * Optimise $validDomain function by using bashism and `grep` * Add black/white/wildcard variables to pass to Reload() * Revert reload variable behaviour * Ensure Reload() function passes correct options to gravity.sh Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	406098e55a	Speed up refresh time * Add "--blacklist-only" to only run essential gravity functions * Pass "--wildcard" option to `gravity.sh` to ensure dnsmasq is restarted Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	7 years ago
DL6ER	ec4e9780ed	Accept underscores when validating domain names (#1571 )	7 years ago
Mcat12	cb09e0bc9a	Strip `/*` from the end of the IPv6 address Fixes #1536	7 years ago
Adam Warner	536585b846	Colourise Core Output Text (#1471 ) * Define colours within COL_TABLE * Do not output colours for non-terminal instances * Removed ":::" * Fixed indenting & spacing * Made output consistent throughout project * Reworded text to fit on standard 80 char wide Terminal screen * Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi * Make "Installation/Update Complete" the final msg * Remove redundant messages * Simplify update available message * Confirm user would like to begin uninstall * If "git pull" string says "Already up-to-date.", place [i] before it * Colour Temp/Interface output * Made `pihole disable 5z` invalid * Added error fallback if invalid argument (not s/m) is detected * Quoted "$2" for consistency * Updated help text * L185/286: Replaced echo with redirect * User agents for adblock.mahakala.is/adaway.org unnecessary * Print newline on confirmation of repository reset * Add output to admin-related dnsmasq restarts * Return error message for "pihole -q" * Imply default checkout behaviour with y/N * Fix uninstall failing to remove pihole user * Print checkout 'git remote show origin' STDERR on new line * Replaced checkout "AdminLTE" wording with "Web Admin"	7 years ago
WaLLy3K	7453bf2ee6	Fix wildcard help text * -wild is not a valid option since we're already using -wild	7 years ago
WaLLy3K	7d17c652f3	Merge branch 'development' into development	7 years ago
Adam Warner	90119c75d5	more merge conflicts!	7 years ago
WaLLy3K	b721ed49ab	Update Help Output (#1467 ) * File consistency * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Standardise core help text * Added help text for disable command * Added help text for logging command * Clean up * Fixed certain new lines and spaces * Sync with development branch * Formatting consistency * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Fixed certain newlines and spaces * Admin help text * Added help text for interface command * Sync with development branch * Formatting consistency * Tabs to 2 spaces * Fixed some wording * Fixed certain spaces * Formatting consistency * Minor wording changes * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Fixed certain newlines and spaces * Blacklist help text * Formatting consistency * Tabs to 2 spaces * Corrected indenting * Cronometer help text * Formatting consistency * Fixed certain newlines and spaces * Corrected indenting * Checkout warning alteration * Add checkout help text * Corrected help output	7 years ago
Dan Schaper	25601b9fcc	Document `sed` substitution for user readability Comment the oneliner with explanations of what each step does.	7 years ago
Adam Hill	55f78e3b64	Update list.sh I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)	7 years ago
Mcat12	8fa209f0df	Merge pull request #1322 from pi-hole/FixWildCardBlacklisting Only remove from wildcard list if domain is being added to whitelist …	7 years ago
Adam Warner	6b862dd9e9	Only remove from wildcard list if domain is being added to whitelist or blacklist	7 years ago
Markus Napp	bb7a7d94ef	Replace misleading letter variable	7 years ago
Markus Napp	9a475cc010	Rewrite help text for better handling of params	7 years ago
Markus Napp	ae30c285a2	Fix handling of wildcard help text	7 years ago
DL6ER	6f8893d950	Merge pull request #1301 from pi-hole/fix/removewildcard Remove wildcard entry when adding the very same domain either the white- or blacklist	7 years ago
DL6ER	cf31561267	Remove wildcard entry when adding the very same domain either the white- or blacklist	7 years ago
Jacob Salmela	7a1a2dec67	update license to EUPL on core files	7 years ago
Markus Napp	01f643e5eb	fixup! Fix spacing for wildcard help in list script	7 years ago
Markus Napp	8037f3e332	Fix spacing for wildcard help in list script	7 years ago
Markus Napp	afe5176e01	Justify help output to match main script	7 years ago
DL6ER	3d4516dc95	Improve regex	7 years ago
DL6ER	06873fe69e	Remove misplaced start of string expression. Fixes #1191	7 years ago

1 2

70 Commits (f65f793a0d0d7dbc5882be38858c986f42b8c776)