Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-27 07:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
5406 commits 10 branches 109 tags 28 MiB
Commit graph

5406 commits

This branch
This branch
All branches
Author SHA1 Message Date
Promofaux
a448b48eaf Merge remote-tracking branch 'origin/master' 2016-01-30 14:38:33 +00:00
Adam Warner
3c6551f202 Merge pull request #259 from pi-hole/CBH/Bugfix/Formatting 
Cbh/bugfix/formatting
 2016-01-30 14:37:02 +00:00
Promofaux
9e0c7ed29a Merging from CBH bugfix 2016-01-30 14:34:12 +00:00
Promofaux
677293f3a9 Merge branch 'CBH/Bugfix/Formatting' 2016-01-30 14:29:52 +00:00
Promofaux
34bd7ce3a7 Merge branch 'master' into CBH/Bugfix/Formatting 2016-01-30 14:29:01 +00:00
Adam Warner
21a07e7419 Merge pull request #263 from pi-hole/newVersioning 
New versioning system
 2016-01-29 20:47:10 +00:00
Adam Warner
6b50ea6504 Merge pull request #249 from pi-hole/OperationBlockListFromGravity 
Seperate blocklist sources from gravity.sh to allow users to manage their own list of blocklists that persists through installs/upgrades
 2016-01-29 19:39:11 +00:00
Mcat12
895647b908 Don't copy version to install dir 2016-01-29 12:32:58 -05:00
Mcat12
0ece58b9cb Add version 2016-01-29 12:23:03 -05:00
Mcat12
49a56cf131 Start on new versioning 2016-01-29 08:25:35 -05:00
PromoFaux
5fa0d798e2 Update README.md 
Add link to segment on MSDN/Channel 9's Defrag Show
 2016-01-28 10:13:55 +00:00
Dan Schaper
cadc506aa5 Remove extraneous whitespace from basic-install.sh 2016-01-28 09:25:00 +00:00
Chad Howell
eee0ccef8c Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---pihole-system-user-v2 2016-01-27 22:44:14 -05:00
Chad Howell
088bd632ab Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---Descrition-for-pi-hole-v1-back-function 
# Conflicts:
#	automated install/basic-install.sh
 2016-01-27 22:43:43 -05:00
Promofaux
52b5d7143b Merge branch 'development' 2016-01-27 23:48:24 +00:00
PromoFaux
60bf14d4dd Merge pull request #255 from pi-hole/Bugfix/InstallScriptFix 
Force apt-get update if it has not been run today. This will stop dependency errors on a fresh install.
 2016-01-27 23:43:38 +00:00
Promofaux
c00fb44cee Do not force apt-get upgrade on the user. Instead, advise them. We only need to make sure apt-get update has been run 2016-01-27 23:28:36 +00:00
Promofaux
5111880edf remove erroneous -o 2016-01-27 22:35:52 +00:00
Promofaux
3d78b44a8e Changes as in #253, but with less commits to keep the repo tidy 2016-01-27 22:32:08 +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
edd0b809b7 Merge pull request #254 from pi-hole/master 
a
 2016-01-27 15:47:54 +00:00
PromoFaux
98a0d17431 Update basic-install.sh 
Emergency Bug fix. I take the blame for this one, it got lost in a merge!
 2016-01-27 15:28:40 +00:00
PromoFaux
b1bd56cd51 Update basic-install.sh 2016-01-27 09:47:28 +00:00
Chad Howell
ae336da7a1 Fix formatting, use consistent style, add comments 
Fix formatting, use consistent style, add comments
 2016-01-27 01:11:38 -05: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
Dan Schaper
0b077b9601 Merge pull request #244 from pi-hole/development 
Code update for 2016/01/25.
 2016-01-25 11:04:09 -08: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
Chad Howell
d74c8261aa dnsFile2="/etc/dnsmasq.conf.orig" 
added .orig
 2016-01-25 01:38:41 -05:00
Chad Howell
ac373545d0 versionCheckDNSmasq() fixups 
versionCheckDNSmasq() fixups per dschaper's suggestions.
 2016-01-25 01:27:10 -05:00
Chad Howell
a21948d2c6 Typo fix 
Typo fix
 2016-01-25 01:09:45 -05:00
Chad Howell
940480effe Revert "Fix backup to use new 01-pihole.conf location" 
This reverts commit 0c444e6f2b.
 2016-01-25 00:57:36 -05:00
Chad Howell
29c593b8b0 Add user pihole if user does not exsist 
Check if user pihole exist and add if not.  This will give pihole its
own system user without a login or home directory that is not system
dependent.
 2016-01-25 00:28:53 -05:00
Chad Howell
0c444e6f2b Fix backup to use new 01-pihole.conf location 
Fix backup to use new 01-pihole.conf location
 2016-01-25 00:12:51 -05:00
Chad Howell
6cf6e16d22 Add ability to choose upstream DNS servers 
Give the user the ability to choose between Google and DynDNS upstream
servers.  Then insert the chosen DNS servers in to
/etc/dnsmasq.d/01-pihole.conf.  Todo: extend choices to include manually
entered DNS servers.
 2016-01-25 00:11:00 -05:00
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.
 2016-01-25 00:05:17 -05:00
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.
 2016-01-25 00:04:02 -05:00