193 Commits (6f0b659b38dc998f3ffe7022203f5f1b93cbf61a)

Author	SHA1	Message	Date
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	9c94af04cc	Fixes #432. Thanks to @VDRrulez and @jradwan for pointing it out...	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	7f9410fd34	Added uninstall option to bash-completion	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	d47fbbbe96	Mcat12 requests. Added bash-completion support	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	bb66d559e7	Merge branch 'development' ... Conflicts: gravity.sh	8 years ago
nate	7b8fa3b922	Permissions changed for /etc/pihole and cleaned up some output	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	f8427ab789	Merge remote-tracking branch 'refs/remotes/pi-hole/development' ... Conflicts: README.md advanced/Scripts/blacklist.sh advanced/Scripts/whitelist.sh automated install/basic-install.sh gravity.sh	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
Promofaux	bc09760c84	Grab changes by @rosskevin. (#386 - lighttpd changes to handle JS files)	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
Kevin Ross	b79db36336	no need for the X- header prefix in the string	8 years ago
Kevin Ross	d3971b26e4	add a valid js stub	8 years ago
Kevin Ross	a44a201f00	rewrite js files to a valid stub	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
Carter Maxwell	4f90b41343	remove trailing whitespace dnsmasq.conf.original	8 years ago
Adam Warner	3a46e7fc0a	Merge pull request #338 from pi-hole/auto-chronometer-lcd-setup ... Auto chronometer lcd setup	9 years ago
jacobsalmela	c5d45edf2d	consoleblank=0 ... This makes sure the LCD screen does not go blank after a set period of time.	9 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.	9 years ago
jacobsalmela	f0e5b2b6f9	Merge branch 'master' into auto-chronometer-lcd-setup	9 years ago
Hippyjake	21c688a8a8	add uptime -p to chrono script	9 years ago
jacobsalmela	3142992c57	update	9 years ago
Promofaux	4c24186911	Fixes divide by zero error.	9 years ago
Promofaux	70e4104c17	Merge remote-tracking branch 'origin/development'	9 years ago
Mcat12	48f9a61ff0	Updated License	9 years ago
Chad Howell	abef758ff6	Get ready for user selected DNSs ... Prep for using sed to insert user selected DNSs into 01-pihole.conf. Selections will come from dialog during install script containing the following choices: Google, DynDNS, and eventually 2 custom DNS servers.	9 years ago
Chad Howell	e5f9663a0e	Move dnsmasq.conf to dnsmasq.d/01-pihole.conf ... Check if /etc/dnsmasq.conf is from pihole. If so, replace with an original and install new in .d directory. Add and unmolested version of dnsmasq.conf to the ./advanced directory.	9 years ago
Chad Howell	ff5ed561cc	Rename dnsmasq.conf to 01-pihole.conf ... Rename dnsmasq.conf to 01-pihole.conf to prepare for move to /etc/dnsmasq.d/ per the normal way of modding configs on Debian based systems.	9 years ago
Promofaux	754beed3a1	Bring up to date with master	9 years ago
Promofaux	8ecf8eb76c	output to match other scripts	9 years ago
Promofaux	3cd1a5b1d5	... Helps if I add the changes to the repo file, and not the test file on my pi.	9 years ago
Promofaux	dfcf9d133e	Make output make a bit more sense	9 years ago
jacobsalmela	71fd32b1f4	script to set everything up	9 years ago
jacobsalmela	fcf3b4e4e2	file to set lcd font size	9 years ago
Dan Schaper	1e735c26c4	Repo Change QuickFix ... QuickFix for Repo location change.	9 years ago
Dan Schaper	494fcd60ab	Merge branch 'development' of https://github.com/jacobsalmela/pi-hole into development	9 years ago
Mcat12	544919175c	Added back in debugging response header	9 years ago
Mcat12	ede8f4714f	Removed extra http redirect	9 years ago
Promofaux	af982a02af	Move call to CheckIPv6 function into CalcBlockedDomains, rather than relying on remembering to call it before you call CalcBlockedDomains.	9 years ago
Jacob Salmela	9ba38e668a	Merge pull request #193 from PromoFaux/Chronometer ... Major overhaul of chronometer script	9 years ago
Adam Warner	f665899116	Update chronometer.sh ... weirdness	9 years ago
Adam Warner	de464e17cc	Update chronometer.sh ... Note to self, Find&Replace>Replace All is a bad idea.	9 years ago
Adam Warner	0eed56380d	Update chronometer.sh ... What, me? Reference the wrong file?	9 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.	9 years ago
Jacob Salmela	d77399727c	Merge pull request #189 from jacobsalmela/whitelist ... Switched CRLF to LF (DOS to UNIX)	9 years ago
Promofaux	414ef54cfe	Switched CRLF to LF (DOS to UNIX)	9 years ago
jacobsalmela	5d608a2db5	leave system cron alone ... Taking JoshKastang’s idea from #153, the system cron file will be left alone and the pihole.cron gets its own.	9 years ago
jacobsalmela	bd5ed2bcf0	move webinterface.sh into scripts folder ... I also renamed it to make it is easier to identify.	9 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
jacobsalmela	ca5e34a9a9	Merge branch 'master' into whitelist ... # Conflicts: # gravity.sh	9 years ago
Jacob Salmela	4b1dd8a2a5	fixes #158 ... Running at midnight, not 11:58 in the afternoon.	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	d215fa9ade	Resolve merge confict	9 years ago
Dan Schaper	cb91b8f5fa	Add copyright headers	9 years ago
Jacob Salmela	f453d407a9	log-async ... For better performance. I have been using it for a few weeks with no adverse effects.	9 years ago
Jacob Salmela	49a40115c8	fixes #105	9 years ago