410 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Promofaux	96011bc2ae	make InstallWebAdmin() a bit more intelligent, and less verbose. Checks if installing over an existing installation, and if so, will remove existing webadmin folder.	2016-01-20 22:02:54 +00:00
Promofaux	4f59577fd1	Remove SUDO from line that runs gravity.sh to stop files in /etc/pihole being owned by root	2016-01-20 21:20:52 +00:00
Dan Schaper	494fcd60ab	Merge branch 'development' of https://github.com/jacobsalmela/pi-hole into development	2016-01-20 05:25:49 +00:00
Mcat12	544919175c	Added back in debugging response header	2016-01-20 05:23:30 +00:00
Mcat12	ede8f4714f	Removed extra http redirect	2016-01-20 05:23:15 +00:00
Dan Schaper	8094f7234c	Merge pull request #202 from PromoFaux/FixChronometer ... Fix chronometer	2016-01-19 17:39:46 -08:00
Dan Schaper	7dfd9f0378	Merge pull request #205 from PromoFaux/InstallScript ... Clean /etc/pihole/list.* during `basic-install.sh` to set a baseline for install procedures. Fixes #195. Submitted by @PromoFaux.	2016-01-19 16:21:49 -08:00
Promofaux	bc51f88805	Check if any list.* files exist from previous installation, if they do delete them.	2016-01-19 22:52:29 +00:00
Dan Schaper	e04e2537a8	Merge pull request #203 from jacobsalmela/master ... Merge master into development	2016-01-19 13:20:21 -08:00
Promofaux	af982a02af	Move call to CheckIPv6 function into CalcBlockedDomains, rather than relying on remembering to call it before you call CalcBlockedDomains.	2016-01-19 21:14:01 +00:00
Jacob Salmela	03277899ca	Merge pull request #199 from PromoFaux/master ... Update Readme to link to whitelist/blacklist wiki page	2016-01-19 12:16:41 -06:00
Adam Warner	6756843be7	Merge pull request #2 from PromoFaux/PromoFaux-patch-1 ... Update README.md	2016-01-19 17:14:10 +00:00
Adam Warner	ac35417ab0	Update README.md ... Updated Whitelist/Blacklist section - added link to wiki Added information about `chronometer.sh -j`	2016-01-19 17:13:48 +00:00
Adam Warner	092c951078	Merge pull request #1 from jacobsalmela/master ... Merge from upstream	2016-01-19 16:26:09 +00: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