400 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ChadBHowell	4e81a0363a	Don't back original dnsmasq.conf ... Don't need to back original dnsmasq.conf if we are not changing it	2016-01-18 23:28:00 -05:00
ChadBHowell	94835bcc97	Move dnsmasq.conf to dnsmasq.d/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. Also will prevent our conf from getting stomped during upgraded. Todo: fix up the backup section to save from both the old way and the new way.	2016-01-18 23:19:49 -05:00
ChadBHowell	d1452b6da7	Add unzip to installDependencies() ... Add unzip to installDependencies() in case some systems are missing it.	2016-01-18 23:08:56 -05:00
ChadBHowell	e5c682069b	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.	2016-01-18 23:04:13 -05:00
Jacob Salmela	9ba38e668a	Merge pull request #193 from PromoFaux/Chronometer ... Major overhaul of chronometer script	2016-01-18 17:36:33 -06:00
Adam Warner	f665899116	Update chronometer.sh ... weirdness	2016-01-18 23:35:21 +00:00
Adam Warner	de464e17cc	Update chronometer.sh ... Note to self, Find&Replace>Replace All is a bad idea.	2016-01-18 22:24:02 +00:00
Adam Warner	0eed56380d	Update chronometer.sh ... What, me? Reference the wrong file?	2016-01-18 22:15:39 +00:00
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.	2016-01-18 22:03:53 +00:00
Jacob Salmela	0a57b43f09	C.H.I.P. ad blocking project	2016-01-17 20:55:02 -06:00
Jacob Salmela	48f8d7ed0f	pi-hole mentioned in a podcast ... Worth a good laugh when they say "shut your pie hole!"	2016-01-17 20:34:48 -06:00
Jacob Salmela	d77399727c	Merge pull request #189 from jacobsalmela/whitelist ... Switched CRLF to LF (DOS to UNIX)	2016-01-17 18:34:02 -06:00
Jacob Salmela	56ea07c1ec	Merge pull request #187 from PromoFaux/whitelist ... Switched CRLF to LF (DOS to UNIX)	2016-01-17 08:56:09 -06:00
Promofaux	414ef54cfe	Switched CRLF to LF (DOS to UNIX)	2016-01-17 14:09:06 +00:00
jacobsalmela	0a0f00da3b	fixes #169 ... exits if sudo is not installed when run as a regular user	2016-01-16 14:10:03 -06:00
jacobsalmela	bee109c784	better uninstall ... More from JoshKastang. This closes #153 as it is the last step from his ideas.	2016-01-16 13:56:08 -06:00
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.	2016-01-16 13:48:29 -06:00
jacobsalmela	7c6ef0cfd0	privileged install ... This puts sudo in a variable if run as a regular user. If already running as root, the script proceeds as normal. Not a perfect fix, but should help for install on other systems.	2016-01-16 13:40:09 -06:00
Jacob Salmela	0cf859344a	Merge pull request #176 from xd1936/patch-1 ... Install Figlet Fonts with Toilet	2016-01-16 13:19:15 -06:00
jacobsalmela	6125b2520b	install git for updateDashboard.sh ... I also download and chmod the script	2016-01-16 13:15:44 -06:00
jacobsalmela	bd5ed2bcf0	move webinterface.sh into scripts folder ... I also renamed it to make it is easier to identify.	2016-01-16 13:12:55 -06:00
Jacob Salmela	a2a58f7b39	Merge pull request #180 from jacobsalmela/whitelist ... Whitelist/blacklist improvements	2016-01-16 12:24:43 -06:00
Jacob Salmela	87980c6df8	Merge pull request #174 from PromoFaux/whitelist ... Whitelisting changes	2016-01-16 11:58:08 -06:00
Promofaux	f9a2ca5c32	Tidy up help text on both scripts. Add quiet help.	2016-01-16 00:47:45 +00:00
Leo	665dfdfe8e	Install Figlet Fonts with Toilet ... Some OS' don't have Figlet Fonts, which causes `chronometer.sh` to have `error: font small not found` instead of the pretty "Pi-hole" display	2016-01-15 18:50:32 -05:00
Adam Warner	2b0bee085b	Incorrect reference to whitelist in the blacklist.sh comments :)	2016-01-15 18:57:20 +00:00
Adam Warner	ddfefb291d	Merge branch 'Whitelistingchanges' into whitelist	2016-01-15 18:45:59 +00:00
Adam Warner	5d842a7533	Merging	2016-01-15 18:45:12 +00:00
Adam Warner	2284a27814	Consumes blacklist.sh now, too.	2016-01-15 15:54:11 +00:00
Adam Warner	f68cf10efa	Tidied up a couple of things	2016-01-15 15:54:00 +00:00
Adam Warner	89e3c25a90	Behaves like whitelist, but on the blacklist	2016-01-15 15:53:40 +00:00
Adam Warner	6b1f14647c	add reference to blacklist.sh	2016-01-15 15:52:27 +00:00
Adam Warner	14ee4850af	Placeholder for blacklist script	2016-01-15 14:50:13 +00:00
Adam Warner	cc62d984d2	Changed whitelist function to outsource to whitelist.sh	2016-01-15 14:49:16 +00:00
Adam Warner	534dbc9b6e	added a quiet option for when the script is called by gravity. Less output = less confusion!	2016-01-15 14:48:07 +00:00
Adam Warner	8ad116fe7b	Aiming to get whitelist.sh to run either standalone or to be called from gravity.sh. Initial commit	2016-01-15 14:17:55 +00:00
jacobsalmela	ca5e34a9a9	Merge branch 'master' into whitelist ... # Conflicts: # gravity.sh	2016-01-14 18:12:45 -06:00
Jacob Salmela	9ff1129510	Minibian Pi-hole	2016-01-14 17:11:16 -06:00
Jacob Salmela	4b1dd8a2a5	fixes #158 ... Running at midnight, not 11:58 in the afternoon.	2016-01-12 17:44:08 -06:00
Jacob Salmela	b5bdfe27be	Merge pull request #155 from JoshKastang/webinterface-update ... replaces the non-repository managed web interface for pihole and keep…	2016-01-11 17:39:42 -06:00
Jacob Salmela	0ef0b0b661	LCD real-time stats	2016-01-10 14:09:40 -06:00
Josh Kastang	802638ce8b	replaces the non-repository managed web interface for pihole and keeps it updated	2016-01-10 19:08:29 +00:00
Jacob Salmela	cfd6e0d65d	more coverage and an API	2016-01-10 10:40:58 -06:00
Jacob Salmela	93664aeb4e	cleaning up the readme ... - removed most of the video images to reduce clutter - converged the "coverage" and "video" sections into a bulleted list of links - added a new project link (pi-hole on/off button) - moved projects up in the page so it's easier to find and see what people are doing with Pi-hole - removed custom conf section since it will be suited better in the wiki or FAQs - added a help section	2016-01-04 20:32:46 -06:00
Jacob Salmela	6f9d2d0567	fixes #145 ... A much more elegant way to get the screen size.	2016-01-02 17:20:33 -06:00
Jacob Salmela	d2b6947886	Merge pull request #146 from iblamefish/multiple-interfaces ... installer - only select first (probably default) interface in list instead of all	2016-01-02 17:17:58 -06:00
Clinton	bc3224e0b9	installer - only select first (probably default) interface in list instead of all	2016-01-02 22:10:26 +00:00
Jacob Salmela	ba75c4c62c	Merge pull request #144 from jacobsalmela/ipv6 ... Enables ad-blocking over IPv6 for an even better Internet experience.	2016-01-01 18:44:07 -06:00
Jacob Salmela	3fc1817e7a	Merge branch 'master' into ipv6	2016-01-01 18:34:33 -06:00
Jacob Salmela	ab1352b48e	Merge pull request #143 from iblamefish/master ... fixes #142 kill -HUP erroring on gravity_reload if dnsmasq is not running	2016-01-01 18:16:35 -06:00