pi-hole

Commit Graph

Author	SHA1	Message	Date
Mcat12	3077c22e4f	Change help strings from wildcard to regex blacklist Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
DL6ER	a7c73036f0	pihole -t: Warn user if Pi-hole's logging is disabled Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Rob Gill	2255d05664	Remove scanlist(), now in query.sh Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	b1207949ac	Call query.sh to replace queryFunc() Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	40bc390c3b	Admin Console -> "Web Interface" User facing --help text changes Admin Console --> Web Interface and additional branch option Signed-Off-By: Rob Gill <rrobgill@protonmail.com>	6 years ago
RamSet	2f24e5ceb7	Minor correction for double instance of the word "found". Signed-off-by: RamSet <RamSet@gmail.com>	6 years ago
Adam Warner	e49a9096a5	accidentally a 'shift' Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	33148ba832	Add help text to pihole command to document new flag Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	bca23dd896	Allow passing of --check-only to update script. Don't run installer for updating web files, it's handled by getGitFiles. I think this works... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	310d33b8ee	Merge dev > FTLDNS fix merge conflicts Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Razvan Radu	7361d5d3ea	Update pihole lolcahost probe for DNS status Signed-off-by: Razvan Radu <ramset@gmail.com>	6 years ago
Adam Warner	0b87f489d5	Look for pihole-FTL, not dnsmasq! Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
DL6ER	7ed45d26c2	Remove " " at some places where they shouldn't be Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	e8ec0dc701	Use pihole-FTL resolver in pihole and gravity Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	d7dde06552	Add "pihole logging off noflush" command Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	05d015169c	Check for local version and branches every 10 minutes, check for remote versions only once a day Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Jacob Salmela	9631519eb1	Merge pull request #1752 from pi-hole/new/bashupdatechecker Add bash / cron based update checker for Pi-hole	7 years ago
DL6ER	6ca47dc3b3	Add bash / cron based update checker for Pi-hole	7 years ago
Mcat12	8dba2a88e2	Move FTL re-parsing call after dnsmasq restart	7 years ago
DL6ER	b9ae01d819	Send SIGHUP to pihole-FTL when restarting/reloading dnsmasq Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
WaLLy3K	645d8e0ebd	Fix issue where wildcarding didn't restart dnsmasq Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	80c40e6050	Prevent full stop being interpreted as regex Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	3b300a4d6a	Fix query option handling Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	664d0ea023	Correctly retrieve IPv4/6 addresses for tailFunc() * Add comments for readability * Use `sed -E` for readability * Move `date` into `sed` * Use updated colour codes	7 years ago
Adam Warner	a0bd517380	Merge pull request #1694 from pi-hole/fix/qf-opt Slow query fix & queryFunc optimisation	7 years ago
WaLLy3K	56990618e9	Prevent Block Page issue * Block Page expects to see a full stop, otherwise it will throw an unhandled error	7 years ago
WaLLy3K	54a85d3a63	Fix invalid option case * Ensure `pihole -q doubleclick.com asd` exits with error	7 years ago
WaLLy3K	c2d3e99ddd	Slow query fix & queryFunc optimisation * Validate modified code using Shellcheck & Strict Bash * Added and/or elaborated more comments * scanlist() should exit if /etc/pihole is not available * Add `export LC_CTYPE=C` to prevent extreme grep slowdown * Consider "domain.com#comment" an exact match * Add specialised wildcard searching grep * Optimise and simplify queryFunc() for readability * Replace IDN `python` parsing with `idn2`, as `python` is not guaranteed to be available * Use ${COL_BOLD} when printing filenames	7 years ago
WaLLy3K	4d39ab9753	Allow force-reload to be used when restarting DNS * Remove duplicate coltable variable definition and source * Minor comment modifications * Add "$2" to restartdns	7 years ago
WaLLy3K	56b8c4bfdb	Merge branch 'development' into tweak/gravity	7 years ago
WaLLy3K	15a5f425bf	Replace nc with psuedo-device * Also fix minor conditional style issue	7 years ago
WaLLy3K	3125d24ded	Replace superseded netstat command * Make colfile readonly, and use path of PI_HOLE_SCRIPT_DIR * Rename piholeStatus function to statusFunc for function name consistency * Replace superseded netstat command with nc * Perform addn-hosts check using a single grep subshell	7 years ago
WaLLy3K	cc4ada99d8	Use SIGHUP instead of force-reload	7 years ago
Adam Warner	18b41adbf6	Merge branch 'development' into tweak/gravity	7 years ago
WaLLy3K	e0eb5eb2b1	Fix queryFunc if adlists URLs have been removed (#1618 ) * Fix queryFunc if adlists URLs have been removed * Allow for -adlists command line switch (where the "s" is a typo) * Add error message when unable to find associated adlists URL * Provide PR fix on current dev version * Add blResult variable for white/black match * Supporting Block Page queryFunc fixes * Re-add unmerged lines	7 years ago
WaLLy3K	a2825be819	Add dnsmasq "force-reload" option * Made use of $PI_HOLE_SCRIPT_DIR * Fix #1610 & #1624 * Add "$2" to restartDNS options Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	7 years ago
Adam Warner	f2e9d585f7	* Add helptext for `pihole checkout ftl` * Only attempt to install FTL if branch was found * ~~corebranches~~ webbranches (web branches now actually listed) Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	3a50b91722	User-friendly queryFunc() output (#1483 ) * User-friendly queryFunc() output * Silence grep errors * Provide 'pihole -q -h' help output * Rewrite option handling * Loop through grep stdout to make query output user friendly * Add -adlist option to show block list URL instead of internal file name * Limit general searches to 10 matches per block list * Add -all option to override 10 match limit * Fixed 'pihole -h' wording * Further query optimisations * Optimised scanList() output by switching folder * Re-added processWildcards() function * Added "-bp" exact matching option for use with block page * Standardised query output * Separated wildcard search from blacklist/whitelist search * Optimised sorting by sorting glob output and not scanList() output * Fixed result skipping * Add text for wildcard result on exact query * Fix wildcard result output * Multiple wildcard matches on exact query could cause unexpected output * Remove unnecessary replacement * Make grep only output matching text * HOSTS format lists will also output the IP address * That substitution was necessary * Remove IP address from HOSTS format lists * Filter unwanted content * Add /dev/null to grep, to always print file name (even when searching only one block list) * Use three seds to remove unwanted content from block lists * Merge with development * Simplify queryFunc code	7 years ago
WaLLy3K	3631d1349e	Prevent Web Admin from printing restartdns colour codes (#1575 ) * Prevent Web Admin from printing unnecessary msgs * Make DNS restart behaviour consistent	7 years ago
WaLLy3K	209fbf82c4	Colourise tailFunc (#1550 ) * Colourise tailFunc * Strip month, day number and dnsmasq[PID] * Blocked domains show as light red * Queries show as standard colour * Everything else as dark gray * Change tailFunc highlighted lines * Highlight Blocked/Blacklist/Wildcard lines as red * Make DHCP lines default colour * Make sure tailFunc doesn't match on domain names	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
DL6ER	e4cc5b3847	Disable black.list on "pihole disable"	7 years ago
WaLLy3K	6823a62644	Add tricorderFunc back as usable function (#1515 ) As per #1464	7 years ago
WaLLy3K	2b8a8b03a8	Roll back merge #1417 (#1494 )	7 years ago
DL6ER	d913534793	Move wildcards file if blocking is disabled (#1495 ) * Move wildcards file if blocking is diabled * Delete newline	7 years ago
WaLLy3K	2f2825f15e	Tricorder: Insecure Opt-out	7 years ago
WaLLy3K	a620a5c430	Formatting consistency	7 years ago
WaLLy3K	1f3db8b602	Confirm Tricorder is online * Scan port 9998 to confirm the availability of "tricorder.pi-hole.net" * Exit codes for upload process	7 years ago
DL6ER	4e2c6a7b8e	Fix logrotation: manual flushing should be done twice, but automated rotation at midnight should only be done once!	7 years ago
WaLLy3K	075f00cecd	Merge branch 'development' into tc-insecure-optout	7 years ago
WaLLy3K	b9f2ba0717	Wording changes and bug fix	7 years ago
Adam Warner	bc8a5916d8	fix merge conflicts	7 years ago
WaLLy3K	da9ff0cc66	Tricorder: Insecure Opt-out * Check to see if Tricorder is being called directly * Provide opt-out for insecure transmission of debug log * Remove mention of internal function from help menu	7 years ago
WaLLy3K	39b74ebfd4	Show help for "pihole checkout --help"	7 years ago
WaLLy3K	4eb7d2868c	Fix "pihole disable --help" and "pihole -l --help"	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
DL6ER	7abf349730	Use `echo "ABC" \| pihole tricorder` to upload to Pi-hole's medical tricorder. Uses SSL if available.	7 years ago
WaLLy3K	c35c7b2cea	Wrap in double brackets	7 years ago
WaLLy3K	58353e2839	Update queryFunc() to search Whitelist If there is a match in Whitelist/Blacklist/Wildcards, `[ ! -t 1 ]` will cause the search to end if the terminal is closed when the script is called. This has the intended effect of allowing a user to search for a W/B/W domain (as well as all the adlists it's found in) using `pihole -q` via Terminal, but the script will stop searching after a W/B/W match when called by the block page.	7 years ago
WaLLy3K	3081c151bd	Perform EXACT searches on HOSTS lists correctly `\s` on the end may be overkill, but it is the existing scanList() behaviour.	7 years ago
WaLLy3K	a0603ad3b7	Update queryFunc() * Allow scanList() to search files using a wildcard by removing quotes wrapped around `${list}` * scanList() will not provide a domain ouput on each string if exact is specified (`grep -l`) * Remove unused processWildcards() function * Return a message if no domain is specified * IDN domains are converted to punycode when running a `pihole -q` search if the `python` package is available, otherwise will revert to current behaviour * Scan Blacklist & Wildcards first, exiting from search if a match is found (Fixes #1330) * Use one `grep` subshell to search for all ".domains" lists at once (opposed to looping to get every matching file name, and then spawning a `grep` instance for every matching file) queryFunc() will not return "(0 results)" output from files where no match is found * Sort results based off list number * Return a message if no results are found	7 years ago
Anthony Giorgio	fd584dd03b	Formatting cleanup. Convert backticks to quotes to fix error message. Make Pi-hole capitalization consistent. Make Pi-hole capitalization consistent.	7 years ago
Mcat12	c4b43f92ce	Fix help text bug Fixes #1325	7 years ago
Dan Schaper	b8f1eadb7f	Shift off `checkout` from being passed to script from `pihole` Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
DL6ER	8a14a63d5d	Pi-hole checkout feature	7 years ago
DL6ER	dce3e50a00	Check for existence of wildcard blocking list before trying to acces it	7 years ago
Dan Schaper	17b0db6515	Fix for calling -w without -a. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	83b0600863	Carriage return or newline based webcalls. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	38961fb31b	Help text clarification and addition of the automated debuggin flag. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	ba5bbf3523	Modify `pihole` for `-d -a` arguments.	7 years ago
Jacob Salmela	7a1a2dec67	update license to EUPL on core files	7 years ago
Markus Napp	19e30b829a	Add wildcard description to help text, improve other help texts	7 years ago
Jacob Salmela	51acdfa633	remove pihole -s flag	7 years ago
DL6ER	2935275227	Merge branch 'development' into wildcardblacklisting	7 years ago
Adam Warner	12bec1df68	Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh Major simplification of webpage.sh + extend DHCP to IPv6	7 years ago
DL6ER	2b778695b1	Implement querying ad lists support for wildcards (what hell of a bash experience)	7 years ago
DL6ER	40798da6b1	Add blacklisting wildcard support	7 years ago
DL6ER	d0cd39a25f	Added space behind :53 to only match port 53	7 years ago
DL6ER	1e627c7e8f	Make webpage.sh fully library style	7 years ago
DL6ER	9170488b0a	Test if DNS service is listening on local port 53	7 years ago
DL6ER	c674a175ee	Make grep case insensitive	7 years ago
Promofaux	906a1753be	specifically comment out gravity.list addn-host	7 years ago
Adam Warner	bebb569c43	Merge pull request #964 from pi-hole/queryadsonlyexactmatches pihole -q: Add option to show all partial or only exact matches	8 years ago
Mcat12	74e33bb1a0	Merge pull request #973 from pi-hole/taillog Add tail argument to automatically "tail -f" pihole.log	8 years ago
Mcat12	b591df55b0	Tell user how to exit tail command	8 years ago
Mcat12	b9e0e88fe9	Update pihole	8 years ago
DL6ER	5120d9ec33	Add tail option	8 years ago
DL6ER	c0886cb5c6	pihole -q <domain> is partial matching (as before), pihole -q <domain> -exact is exact matching (new behavior)	8 years ago
DL6ER	294df8690c	Do only one grep on each of the lists and count the number of non-empty lines in the result. Improves speed by factor of 2x	8 years ago
DL6ER	fb72ac9904	Show only exact matches for pihole -q	8 years ago
DL6ER	74cb79252c	Only looking for blocking entries (do not scan whitelist.txt)	8 years ago
DL6ER	6cd3c93472	Also query white- and blacklist	8 years ago
DL6ER	eb63e75379	No need for pipe here	8 years ago
Dan Schaper	2ec4acfe52	Begin fixing exit values. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	8 years ago
Mcat12	3ba7d7640f	Merge pull request #933 from DL6ER/delayedreactivation Add possiblity for delayed reactivation of blocking	8 years ago
DL6ER	7bf0985a57	Extended help text of main pihole command	8 years ago
DL6ER	f50cbe74cb	Changed -web (webpage) to -a (admin)	8 years ago
DL6ER	291ca0874a	Fixed two more typos	8 years ago
DL6ER	96f2aa1803	fixed typo	8 years ago
DL6ER	c6857501aa	Removed check for availability of nohup	8 years ago
DL6ER	3aba1607b2	Removed debug echos	8 years ago
DL6ER	f667298b64	Added possiblity for delayed reactivation of blocking	8 years ago
DL6ER	db278d81e4	Added webpage.sh	8 years ago
Dan Schaper	1d64ad1ccd	Stash all changed files, clean directory and pull updates.	8 years ago
Dan Schaper	dfb4ac0365	Keep .yml's from going to user local repos.	8 years ago
Dan Schaper	0ef8832b04	whitespace	8 years ago
Dan Schaper	e42a037b7d	Grep -i instead of cat.	8 years ago
Dan Schaper	fe18d69b65	Grep should start at the beginning of line to make sure it doesn't fire on `#` beginning lines.	8 years ago
Adam Warner	f36e4ba336	Cherry picking `3f049fa79`, conflict fix	8 years ago
Adam Warner	c47c5e466f	consistency	8 years ago
Promofaux	1d21b0da9a	enable or disable logging from pihole command	8 years ago
Adam Warner	469ff45f01	create list.sh. Combines whitelist and blacklist scripts in an effort to reduce code duplication. update pihole script to reflect new white/blacklist command.	8 years ago
Promofaux	8ee98f0a4a	remove a space	8 years ago
Promofaux	82e78fb651	Add output to `pihole disable` and `pihole enable`	8 years ago
Promofaux	d0826b2c33	Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev	8 years ago
Marcus Hildum	640398ced4	Consistency We went with tabs earlier, may as well make that the "standard". Easy enough to switch to spaces too if that's desired with expand(1)	8 years ago
Marcus Hildum	5ebfa5ecf7	heredoc for helpfunc in pihole	8 years ago
tuplink	e199f6db87	spelling updates	8 years ago
tuplink	c83dd3ccd7	change spacing	8 years ago
tuplink	78fbafa1cd	test out new status logic	8 years ago
Tommy Huff	685b775b68	rework status if statments	8 years ago
Tommy Huff	9056a5a7b6	fix spelling / replace tabs with spaces in help	8 years ago
Tommy Huff	3ca3eaa62c	change restartdnsmasq to restartdns	8 years ago
Tommy Huff	aaee895b2b	add pihole status web option to return 1 or 0 for easy use with php	8 years ago
Tommy Huff	7d7e17b351	add toggle to enable or disable pi-hole	8 years ago
Adam Warner	b66f23cfd0	account for new update script	8 years ago
Adam Warner	ce46c4dec4	remove prematurely added code	8 years ago
Adam Warner	77e8be09a1	handle passing arguments to version script	8 years ago
Adam Warner	29ad2496b6	don't output "elevating with sudo" in pihole script, just do it.	8 years ago
Promofaux	a43577fa26	add reconfigure flag to -r command	8 years ago
Promofaux	090fbd04af	Remove ${SUDO} usages and root checks from scripts called by `pihole` command as they should not be called directly.	8 years ago
Promofaux	461de48625	function declarations as per basic-install.sh	8 years ago
Promofaux	9352ba6e4a	about time we exit 0'd	8 years ago
Promofaux	5e883239f9	remove calls for ${SUDO} as per basic-install.sh.	8 years ago
Promofaux	5ea08a2120	add -r to reconfigure pihole (basically runs basic-install.sh from /etc/.pihole)	8 years ago
Promofaux	1a83988e26	Add check at the beginning of update script to check for existence of local repos. If not, redirect user to run install command again.	8 years ago
Promofaux	ec0c68621c	add blank line after Current version display	8 years ago
Promofaux	d58f7c6ec9	Remove references to dashboard update Script	8 years ago
Promofaux	d124c2c12e	Expand to check web admin versions	8 years ago
Promofaux	0229f70761	Make updatePiholeFunc a bit smarter. Only run update if version is not the latest.	8 years ago
Promofaux	dde9281139	Only pull master branch, the rest aren't needed!	8 years ago
Promofaux	4ec01769cb	Appease Jacob.	8 years ago
Promofaux	19b656132d	Make the output of pihole -q a bit clearer. Bye Bye nifty one-liner!	8 years ago
Promofaux	01a9534729	Merge branch 'development' into UpdateMethod # Conflicts: # automated install/basic-install.sh	8 years ago
Promofaux	d938f73207	Fix line endings	8 years ago
Promofaux	344e63c2dc	Add undocumented argument to install script ("pihole") which allows the pihole command to run the update script without prompting the user. Useful for update automation	8 years ago
Promofaux	681144b2a3	Change the switched for updateDashboard and updatePihole(was updateMain)	8 years ago
Adam Warner	77135ca3c7	Actually pass through the argument to the function	8 years ago
Adam Warner	29b548f07c	Add queryfunc	8 years ago
Dan Schaper	af666e2209	Escape space in updateMainFunc Legacy space in path strikes again!	8 years ago

1 2 3 4 5 ...

267 Commits (master)