tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
677 Commits 8 Branches 109 Tags 31 MiB
Commit Graph

677 Commits

Author SHA1 Message Date
PromoFaux 7c5df5dfe3 Merge pull request #229 from PromoFaux/TransferPrep 
Changed URLs in installScripts() to match new organisation links
 2016-01-23 01:34:47 +00:00
PromoFaux 5b62f91bb4 Update README.md 
Whoops, forgot the readme.. *embarrassed face*
 2016-01-23 01:31:33 +00:00
Promofaux e8b8fb0835 s 2016-01-23 00:23:32 +00:00
Promofaux 6663ced38d Initial commit 2016-01-23 00:13:16 +00:00
Dan Schaper 0b03264fb0 Merge pull request #225 from jacobsalmela/bugfix/createPiholeDir 
Bugfix/create pihole dir
 2016-01-22 16:11:15 -08:00
Promofaux c99a8a9b15 initial commit 2016-01-22 20:30:32 +00:00
Dan Schaper ea0fb15ff2 Move creation of pihole directory out of IPv6 function 2016-01-22 19:48:55 +00:00
Adam Warner 05a59b17be Changed URLs in installScripts() to match new organisation links 2016-01-22 16:50:01 +00:00
Leo 8b18fdd322 Update gravity.sh 2016-01-21 17:19:09 -05:00
Leo 1349f584be Use Sudo Detection from Installer in Gravity.sh Also 
Prevents errors from being thrown when gravity.sh is run as root and the user doesn't have sudo installed (just like install.sh does)
 2016-01-21 17:14:55 -05:00
Dan Schaper 48db85187e Merge pull request #219 from jacobsalmela/master 
Update Development
 2016-01-21 12:19:12 -08:00
Dan Schaper d1e054d713 Merge pull request #216 from mechaxl/master 
Fixing minor typos in basic-install.sh
 2016-01-21 09:48:44 -08:00
Kenneth Koski ce578534fe Fixing minor typos in basic-install.sh 2016-01-21 11:33:49 -06:00
Dan Schaper c7c4a5c602 Merge pull request #215 from jacobsalmela/development 
Merge development into master
 2016-01-21 08:42:53 -08:00
Promofaux 3f40a95929 Whoops, should probably commit more often. Massive overhaul. Cleaned up output, less verbose (will still output errors, but gets rid of anything not needed) Added a spinner so users don't think it has stalled 2016-01-20 23:34:18 +00:00
Promofaux 5c25c42da8 Make installPiholeWeb() more inteliigent. Checks for existence of /var/www/html/pihole, and only downloads from repo if it does not exist. Will stop install script from overwriting any tweaks users have made to index.html 2016-01-20 22:14:17 +00:00
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 b512496818 Merge pull request #207 from jacobsalmela/bugfix/Chronometer 
Bugfix for Chronometer
 2016-01-19 17:42:41 -08: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