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
472 Commits 10 Branches 110 Tags 33 MiB
Commit Graph

472 Commits

Author SHA1 Message Date
Promofaux 5111880edf remove erroneous -o 2016-01-27 22:35:52 +00:00
Promofaux f2d71d41a8 Merge branch 'OperationBlockListFromGravity' of github.com:pi-hole/pi-hole into OperationBlockListFromGravity 
Conflicts:
	automated install/basic-install.sh
 2016-01-27 21:16:35 +00:00
Promofaux b75b290351 adlists.default copied on each run of gravity. In case it has been overwritten 2016-01-27 21:14:23 +00:00
Promofaux 701ae06e4a Move copying of adlists.default to gravity.sh 2016-01-27 21:14:06 +00:00
PromoFaux b1bd56cd51 Update basic-install.sh 2016-01-27 09:47:28 +00:00
PromoFaux 4a61b80dd6 Update adlists.default 
Add new line to end of file.. Github was complaining
 2016-01-26 23:14:38 +00:00
Promofaux ef99fe2d18 Add line to copy default ad list into /etc/pihole 2016-01-26 20:33:49 +00:00
Promofaux 352ebc3193 outsource list of adlists to a file in /etc/pihole/. 2016-01-26 20:26:09 +00:00
Promofaux 556799428c Contains default adlists. 2016-01-26 20:22:29 +00:00
PromoFaux 80bec9c5cf Delete install 
Not sure how this got in here... :)
 2016-01-25 16:28:26 +00:00
PromoFaux c24685c49a Merge pull request #243 from pi-hole/HotFix/InstallScript 
Hot fix/install script
 2016-01-25 16:22:36 +00:00
Adam Warner 2b99fa81f3 Tidy up output lines around new code 2016-01-25 16:08:48 +00:00
Adam Warner e87443b3e4 add 'http://mirror1.malwaredomains.com/files/justdomains' to list of ad-list sources, can be removed if it causes problems 2016-01-25 15:53:49 +00:00
Adam Warner 74ea597bd8 Cosmetic enhancement. Add the domain 'Pi-Hole.IsWorking.OK' to the top of the domain list to return a friendlier looking domain when pinging a blocked host! 2016-01-25 15:52:22 +00:00
Adam Warner 354a42dd00 close quotes on line 318!!! 2016-01-25 12:49:04 +00:00
Adam Warner 4cedca3427 add in a prompt to give users the option to quit installation or continue 2016-01-25 12:47:03 +00:00
Dan Schaper e99be28a73 Variable missing $ 2016-01-25 02:31:03 -08:00
Dan Schaper 32389e4ab8 Terminate string with missing quote 2016-01-25 02:27:44 -08:00
Adam Warner 01d7fc0ac9 Removed apt-get update/upgrade, instead checking for updates availible and advising user to update/upgrade after installation of pi-hole. Addresses issue #218 2016-01-25 10:07:12 +00:00
Promofaux 6b76270889 Remove spinner call when adding URLs of adlist to array.. seems to break it. 2016-01-24 22:30:12 +00:00
PromoFaux 5d040f45c8 Merge pull request #239 from pi-hole/development 
Development
 2016-01-24 22:12:04 +00:00
Promofaux cebdcc71a7 Add $SUDO call to spinner() in gravity.sh 2016-01-24 21:27:25 +00:00
Promofaux eec14be10d add $SUDO into spinner control. 2016-01-24 21:19:23 +00:00
Promofaux c179936b54 add $SUDO 2016-01-24 20:49:37 +00:00
Promofaux 649a565801 run apt-get install as sudo when resolving dependencies 2016-01-24 20:35:24 +00:00
Promofaux 2d4ebf5eb5 FIX CONFLICTS 2016-01-24 20:29:22 +00:00
Promofaux 754beed3a1 Bring up to date with master 2016-01-24 20:22:41 +00:00
Promofaux df5059944b Merge branch 'Promofaux-InstallRework' into development 2016-01-24 18:51:10 +00:00
Promofaux 9f0927351d Merge from #236 2016-01-24 18:49:25 +00:00
Promofaux 736edf44e4 Added date check before running apt-get update/upgrade. Wont run apt-get update/upgrade if it has already been run today 2016-01-24 17:53:27 +00:00
Promofaux 8ecf8eb76c output to match other scripts 2016-01-24 17:18:37 +00:00
Promofaux 3cd1a5b1d5 ... Helps if I add the changes to the repo file, and not the test file on my pi. 2016-01-24 16:51:54 +00:00
Promofaux 39507b9d0d Added echo ':::' to the top of the file 2016-01-24 16:47:38 +00:00
Promofaux dfcf9d133e Make output make a bit more sense 2016-01-24 16:46:00 +00:00
Promofaux 8a74942da7 Cleaned up output before running gravity.sh 2016-01-24 16:41:11 +00:00
Promofaux 2fe42138c7 removed a space 2016-01-24 16:37:15 +00:00
Promofaux 1563146918 improvements to git functions (passing parameters). Added >/dev/null to attempt to supress output from apt-get upgrade 2016-01-24 16:33:53 +00:00
Promofaux cf3aea8075 uncomment the apt-get update/upgrade! 2016-01-24 15:27:40 +00:00
Promofaux a539dc41f3 Tidy up gravity output to match install script 2016-01-24 15:25:24 +00:00
Promofaux 6cea480210 Huge update! Base files now cloned from github (or updated if already existing) and copied out to the correct directories. Web admin interface is now cloned from hithub (or updated if already existing). Packages are checked before we go ahead and try to install them anyway. 2016-01-24 03:31:12 +00:00
PromoFaux 3b4bb48a0f Merge pull request #234 from ChadBHowell/CBH---Dependencies 
Add unzip to the dependencies
 2016-01-24 00:13:49 +00:00
Promofaux 206717828b Improve spinner function. 2016-01-23 22:25:30 +00:00
Chad Howell 316d26ede2 Add unzip to the dependencies 
unzip is required for the install script to complete.  Some distros do
not have it installed by default.
 2016-01-23 16:29:52 -05:00
Jacob Salmela f2e471707e Pi-hole chrome extension 2016-01-23 12:39:09 -06:00
Dan Schaper 1e735c26c4 Repo Change QuickFix 
QuickFix for Repo location change.
 2016-01-22 20:46:10 -08:00
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