1417 Commits (master)

Author	SHA1	Message	Date
Marcus Hildum	a30c75ef71	Consistency ... Cleanup!	8 years ago
Marcus Hildum	d0b3727c5d	Consistency ... Yet more cleanup	8 years ago
Marcus Hildum	6e94bf5b6d	Consistency ... You know the drill	8 years ago
Marcus Hildum	0f04e270a7	consistency ... Just more cleanup	8 years ago
Promofaux	c0012540ed	Re-add shebang	8 years ago
Promofaux	9ab6df0e54	Merge branch 'development' into promoTweaksTheSecond ... # Conflicts: # advanced/Scripts/blacklist.sh # advanced/Scripts/whitelist.sh	8 years ago
Marcus Hildum	0efda04920	Use heredocs instead of multiple calls to echo ... There were a lot of places (like in help functions) that used multiple echo calls instead of heredocs. Personal opinion but this seems cleaner.	8 years ago
Marcus Hildum	28eeaf201b	Standardize function declaration ... There were no fewer than three styles of function declaration going on in these files, so I attempted to standardize them to the typical myfucn() { } style.	8 years ago
Promofaux	a64f4cd871	whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument	8 years ago
Promofaux	a41eff1276	Blacklist script now only directly edits blacklist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument	8 years ago
Adam Warner	b66f23cfd0	account for new update script	8 years ago
Adam Warner	27d6e5d8cf	Complete overhaul of update logic. Moved to seperate script	8 years ago
Adam Warner	ce46c4dec4	remove prematurely added code	8 years ago
Adam Warner	013d77488a	complete overhaul of version script. Now with optional arguments!	8 years ago
Adam Warner	29ad2496b6	don't output "elevating with sudo" in pihole script, just do it.	8 years ago
Promofaux	8c0f860601	Use systemctl/service calls instead of killall to restart/reload dnsmasq	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
Dan Schaper	9a421d510a	Ignore comments in adlists.list section.	8 years ago
Dan Schaper	a9c3e2c7ba	Add log_write function. Update version_check to use logical conditionals.	8 years ago
Dan Schaper	7fcb40739d	Close IF statement	8 years ago
Dan Schaper	5a3d319677	Add fail check to dig local and remote.	8 years ago
Dan Schaper	8466d0b681	Change NSLOOKUP to dig for resolver tests, add dnsmasq specific records check	8 years ago
Dan Schaper	5de179f1eb	Remove blacklist comparison.	8 years ago
Dan Schaper	36e10595cc	Change netstat to lsof.	8 years ago
Dan Schaper	edd7f28104	Add internet checks to IP section	8 years ago
Dan Schaper	dba1ab3fc0	Remove compareWhitelist	8 years ago
Dan Schaper	3df9c48012	Include ping statistics in default gateway checks.	8 years ago
Dan Schaper	ac1c299369	Revert overzealous renaming of Pi-hole in pihole.log detection.	8 years ago
Dan Schaper	5bbb3ac49a	Standardize Pi-hole naming.	8 years ago
Dan Schaper	014bdf911a	Add open port detection	8 years ago
Dan Schaper	874853fe18	Add lighttpd to version check	8 years ago
Dan Schaper	274b71f8bc	Relocate hostname checks	8 years ago
Dan Schaper	c41d543d81	Handle lack of IPv6 gracefully.	8 years ago
Dan Schaper	7729ddab30	Mode code realignment. Handle lack of IPv6 gateway gracefully.	8 years ago
Dan Schaper	60c0e59a83	Add IPv6 intelligence to debug	8 years ago
Adam Warner	dcedf6bfd0	Merge branch 'development' into PromoFaux-patch-1	8 years ago
Adam Warner	b1a7b0a186	Update piholeDebug.sh ... I can spell, honest.	8 years ago
Promofaux	a3ef9efd2f	remove updateDashboard script	8 years ago
Adam Warner	8cb2f85a08	Replace `truncate` command with `echo " " >`	8 years ago
Promofaux	b3e7619048	curly brackets all the variables!	8 years ago
Adam Warner	95edb49bb8	Add option for uploading debug log to termbin	8 years ago
Promofaux	e11ef5a7f0	Add version display script. Also checks current version on web and reports version.	8 years ago
diginc	5fb6c5b012	Making the whitelist re-block echo consistent with other WL/BL echos	8 years ago
diginc	3affa73257	Only re-block whitelist deletions if in adlists ... * Prevent blocking benign/untracked domains deleted off whitelist * Issue #581	8 years ago
Dan Schaper	ce8f07750f	Remove trailing slash on os-release check ... Fixes #CLOSED Remove trailing slash that would cause an os-check to always fail out.	8 years ago
Promofaux	61ff12e8d4	Change header to match the rest of the scripts.	8 years ago
Promofaux	e942440bb7	Dan forgot this : `}`	8 years ago
Promofaux	6f068e0b9c	Replace sprunge.us with termbin, which appears to be more reliable.	8 years ago
Sander	11f2524b9b	Instead of an or, cat *release	8 years ago
Dan Schaper	b011e5f838	Add os-release check	8 years ago
Dan Schaper	f45eb84d6b	Add distribution Check	8 years ago
Daniel	9b8efe1b27	Upload log to sprunge.us	8 years ago
bcambl	27a9642090	check for sudo via 'command -v' instead of dkpg-query	8 years ago
Mcat12	3fda2d9ac3	Fix helpfunc not found error	8 years ago
Carter Maxwell	c0e1772e21	Replace toilet with echo	8 years ago
Jim Liu	08e6f60941	Update blacklist.sh	8 years ago
Jim Liu	10066209e7	Update whitelist.sh ... Change piholeIPfile to a permanent location.	8 years ago
Jim Liu	81fdfcba22	Update whitelist.sh	8 years ago
Mcat12	619082dbed	Merge branch 'development' into BugFix463 ... Conflicts: advanced/Scripts/blacklist.sh advanced/Scripts/whitelist.sh	8 years ago
Mayur Raiturkar	56ac04c48e	fixed helpFunc 2	8 years ago
Mayur Raiturkar	b58519b974	fixed helpFunc 1	8 years ago
Promofaux	ad574f5e90	Replace kill with killall	8 years ago
Promofaux	4941a657bf	remove -s switch, as it turns out it worked afterall.	8 years ago
Promofaux	3d4bff9414	Add -s switch to kill command to increase compatability	8 years ago
Adam Warner	77f4126f9b	add root check to whitelist script	8 years ago
Adam Warner	4c890ab202	Add root check to blacklist script	8 years ago
Adam Warner	d10e9b1b6e	add pihole/webui version numbers	8 years ago
Adam Warner	a6bee76581	add location of debug log output file!	8 years ago
nate	2f4f5a6ad2	Added lighttpd error.log to debug output	8 years ago
Promofaux	48fa83c9ac	Fix whitespace	8 years ago
Promofaux	05e0003555	Fixes issue #453	8 years ago
Promofaux	107e0404de	Move `exit 1` outside of `if` block on verbose check to stop dnsmasq reloading	8 years ago
Promofaux	ab99e80333	indent	8 years ago
Promofaux	3154a378a6	Remove clear in DisplayWlist and force verbose to false to tidy up output.	8 years ago
Promofaux	8e04f1c03e	Remove clear in DisplayBlist and forse verbose to false to tidy up output.	8 years ago
Promofaux	c0aadeab3d	fix spelling in name of variable ($versbose -> $verbose)	8 years ago
Promofaux	6c87698f1a	fix spelling in name of variable ($versbose -> $verbose)	8 years ago
Justin Theberge	9a4c5cef86	fix indentations	8 years ago
Justin Theberge	bdfc86f850	fix formatting	8 years ago
Justin Theberge	70dadfba28	add list options requested from issue#442	8 years ago
Adam Warner	391dea445a	Move help output to function, add -h argument	8 years ago
Adam Warner	e074c72130	Move help output to function helpFunc, add -h argument.	8 years ago
Promofaux	849185d3c9	Fix incorrect echo	8 years ago
Promofaux	47cc757ed0	Fix incorrect echo	8 years ago
Promofaux	0bbfb323b1	make whitelist honour pihole.conf file	8 years ago
Promofaux	4f08359786	Make blacklist honour pihole.conf file	8 years ago
nate	7e06769d44	Double quoting	8 years ago
nate	5347ee4896	Write verbose status of processes to debug log & Minor UI Fixes	8 years ago
Promofaux	97d3aedba1	Add some output to the log flush	8 years ago
nate	1a2046a7eb	Added uninstall option to `pihole` command. Minor fixes	8 years ago
nate	6eea9239a7	Merged branch development into PiHoleController	8 years ago
Mcat12	e97755eb91	Fix missing cats	8 years ago
nate	b80821c4b7	Merged branch development into PiHoleController	8 years ago
nate	cf01b5a002	Readded `cat` calls to fix permission issue	8 years ago
nate	28f2a1309e	Merge branch 'development' ... Conflicts: automated install/uninstall.sh	8 years ago
nate	2625d9f7fe	Made piholeDebug.sh +x	8 years ago
nate	5f7c11f495	Sudo added to ifconfig to ensure it runs if debug not run as root	8 years ago
nate	ec4d2d65a6	PromoFaux request: Detailed adlists.list output ... Now tells user (and logs to pihole_Debug.log) that the adlists.default file is in use	8 years ago
nate	fee55fa642	Added gravity.sh to the list of options	8 years ago
nate	76ea1962be	Controller script, pihole.sh added ... Syntax changes for user output to be consistent	8 years ago
nate	f2150ee7e1	Merge conflict resolution	8 years ago
nate	2311b42bca	Merge branch 'ScriptCleanup-Dev' ... Conflicts: README.md advanced/Scripts/blacklist.sh advanced/Scripts/piholeDebug.sh advanced/Scripts/whitelist.sh automated install/basic-install.sh gravity.sh	8 years ago
nate	a4fbccac9b	Merge conflict resolution	8 years ago
nate	a0cf93a7ca	Merge branch 'PiholeDebug' ... Conflicts: README.md	8 years ago
nate	8ef4c12f97	Merge branch 'ScriptCleanup' ... Conflicts: README.md advanced/Scripts/blacklist.sh advanced/Scripts/whitelist.sh automated install/basic-install.sh gravity.sh	8 years ago
nate	6145748bfb	Change single echo to printf to forrect \t interpretation	8 years ago
nate	1a1026b367	Consistent stdout to match basic-install.sh and uninstall.sh	8 years ago
nate	5ee382c8eb	Roll back addition of piholeDebug.sh (production master base)	8 years ago
nate	0b9e78df2c	Cleaned code and added prompt for purge on uninstall	8 years ago
nate	a9c24b456d	Bug fixes and logging improvements ... Finalized for production deployment. Next release targeting a tarball of config files plus additional logging.	8 years ago
nate	b4463bf42c	Added test for nslookup ... Checks the TESTURL for nslookup is not whitelisted	8 years ago
nate	8f8dc66c70	Ignore whitespace when writing config files	8 years ago
Nate	b746250e71	Made all advanced/Scripts/ executable for consistency.	8 years ago
nate	86eafe7a33	Added comparison of gravity.list with Whitelist.txt and Blacklist.txt. ... Added additional echos to help read the debug file. TODO: testNslookup function	8 years ago
nate	04638c9065	Added 01-pihole.conf from /etc/dnsmasq.d/ to log ... Write 01-pihole.conf to debug log	8 years ago
nate	b0dd231018	Modified description in header ... Removed copied header description from piholeLogFlush.sh and replaced with relevant description.	8 years ago
nate	0b5f005a5d	Added piholeDebug.sh script for advanced debugging ... Script piholeDebug.sh added to /usr/local/bin to generate a detailed log file for debugging/troubleshooting.	8 years ago
Morlok8k	d13ae0610e	fix for older versions of uptime, on development branch.	8 years ago
Carter Maxwell	ced0ae0d65	remove trailing whitespace whitelist.sh	8 years ago
Carter Maxwell	876c51302a	remove trailing whitespace updateDashboard.sh	8 years ago
Carter Maxwell	a6877e7c13	remove trailing whitespace chronometer.sh	8 years ago
Carter Maxwell	f633d1fa5b	remove trailing whitespace blacklist.sh	8 years ago
Adam Warner	3a46e7fc0a	Merge pull request #338 from pi-hole/auto-chronometer-lcd-setup ... Auto chronometer lcd setup	8 years ago
jacobsalmela	0116b6341c	updated script ... Added links to where code was borrowed from added reboot at the end also added a few things commented out that might be useful for some people to learn.	8 years ago
jacobsalmela	f0e5b2b6f9	Merge branch 'master' into auto-chronometer-lcd-setup	8 years ago
Hippyjake	21c688a8a8	add uptime -p to chrono script	8 years ago
jacobsalmela	3142992c57	update	8 years ago
Promofaux	4c24186911	Fixes divide by zero error.	8 years ago
Mcat12	48f9a61ff0	Updated License	8 years ago
Promofaux	754beed3a1	Bring up to date with master	8 years ago
Promofaux	8ecf8eb76c	output to match other scripts	8 years ago
Promofaux	3cd1a5b1d5	... Helps if I add the changes to the repo file, and not the test file on my pi.	8 years ago
Promofaux	dfcf9d133e	Make output make a bit more sense	8 years ago
jacobsalmela	71fd32b1f4	script to set everything up	8 years ago
Dan Schaper	1e735c26c4	Repo Change QuickFix ... QuickFix for Repo location change.	8 years ago
Promofaux	af982a02af	Move call to CheckIPv6 function into CalcBlockedDomains, rather than relying on remembering to call it before you call CalcBlockedDomains.	8 years ago
Jacob Salmela	9ba38e668a	Merge pull request #193 from PromoFaux/Chronometer ... Major overhaul of chronometer script	8 years ago
Adam Warner	f665899116	Update chronometer.sh ... weirdness	8 years ago
Adam Warner	de464e17cc	Update chronometer.sh ... Note to self, Find&Replace>Replace All is a bad idea.	8 years ago
Adam Warner	0eed56380d	Update chronometer.sh ... What, me? Reference the wrong file?	8 years ago
Promofaux	487c26db44	Major overhaul. Added -j option to output stats as JSON formatted string. If run with no option, then chronometer runs as normal. Fixed calculations to match those on the web dashboard.	8 years ago
Jacob Salmela	d77399727c	Merge pull request #189 from jacobsalmela/whitelist ... Switched CRLF to LF (DOS to UNIX)	8 years ago
Promofaux	414ef54cfe	Switched CRLF to LF (DOS to UNIX)	8 years ago
jacobsalmela	bd5ed2bcf0	move webinterface.sh into scripts folder ... I also renamed it to make it is easier to identify.	8 years ago
Promofaux	f9a2ca5c32	Tidy up help text on both scripts. Add quiet help.	9 years ago
Adam Warner	2b0bee085b	Incorrect reference to whitelist in the blacklist.sh comments :)	9 years ago
Adam Warner	5d842a7533	Merging	9 years ago
Adam Warner	f68cf10efa	Tidied up a couple of things	9 years ago
Adam Warner	89e3c25a90	Behaves like whitelist, but on the blacklist	9 years ago
Adam Warner	14ee4850af	Placeholder for blacklist script	9 years ago
Adam Warner	534dbc9b6e	added a quiet option for when the script is called by gravity. Less output = less confusion!	9 years ago
Adam Warner	8ad116fe7b	Aiming to get whitelist.sh to run either standalone or to be called from gravity.sh. Initial commit	9 years ago
Jacob Salmela	57282cfe16	ugly hack to whitelist from the Web interface ... I wanted the whitelist feature to keep the user on the same page without having to reload it. I'm sure someone better versed in PHP could eliminate the need for this hack. Nonetheless, it works. www-data runs the script if executed from the Web interface. www-data also needs access to write to /etc/pihole/gravity.list to actually remove the domain. So a few more things need to happen before this will fully work. The changes in this script won't change what is displayed if run from the terminal, but will help when it needs to be run from the Web interface, so I am just committing this now. The only other thing I would like to see would be a progress spinner, but my Web skills still need some work...	9 years ago
Dan Schaper	cb91b8f5fa	Add copyright headers	9 years ago
Jacob Salmela	831322b8b2	replace file paths with variables	9 years ago
Jacob Salmela	573c1ef94f	double bracket notation	9 years ago
Jacob Salmela	a2cddda590	if whitelist.txt doesn't exist, create it	9 years ago
Jacob Salmela	a675dc3f2c	Merge pull request #68 from dschaper/hawson-reduce-memory ... Hawson reduce memory	9 years ago
Jacob Salmela	1b51b9ade3	for use as a cron job ... The log will be flushed daily and stats will be stored in a DB for displaying on the Web interface.	9 years ago
Nathan Jones	deb48c124f	Improve whitelisting script ... Match domain exactly instead of partially. Gather list of domains to minimize number of times that hosts file must be enumerated. Only add domain to whitelist if it isn't already present.	9 years ago
Fourdee	52ef76d717	missed a few more /etc/host changes	9 years ago
Dan	024395b73b	Update chronometer.sh ... Missed a change todaysAdsEliminated to /\/etc\/pihole\/gravity.list/	9 years ago
Fourdee	9d99a4ef36	Patch 3 - Dont use /etc/hosts ... /etc/pihole/gravity.list now stores the block list. Ensures the /etc/hosts file is left untouched.	9 years ago
Dan	9627b27f15	pihole logfile changes ... https://github.com/jacobsalmela/pi-hole/pull/27	9 years ago
jacobsalmela	11614263b8	better version of LCD display stats	9 years ago
jacobsalmela	9a2862de62	closes #24 whitelist without running gravity.sh ... It's pretty slow because /etc/hosts is so large, but it works. You can add any number of domains as arguments and it will search for and remove each one. Maybe someone smarter knows how to make it faster...	9 years ago
jacobsalmela	fd2b24f2a0	preparing files for merge and for testing automated install ... I haven't merged anything before, so hopefully, I won't mess it up too bad!	9 years ago