Commit graph

6251 commits

Author SHA1 Message Date
Daniel Fayette
73bfbba5f7 Set file permisions on /etc/pihole
Ensures file permisions on $piholeDir before reload/restart of dnsmasq
2016-02-10 15:07:31 -06:00
Daniel Fayette
46d7bfecdb Check for 25mb of free disk space before install
Function will check the free space of / (root)

If the free space is less than 25MB it will give directions
  on how to expand the disk.

Fixes #163
2016-02-10 09:34:06 -06:00
Daniel Fayette
a734927591 Fixes gravity_transport variable interpretation.
Adding (") around Variables passed to function ensures
  spaces are handled and that missing arguments are
  accounted for.
2016-02-09 19:51:03 -06:00
Promofaux
255706e173 Bring dev branch up to date with master bug fixes 2016-02-09 20:44:49 +00:00
Promofaux
b2fbf46e60 Added more adlists to the defaults. By default we now block ~ 155,600 ad and tracker domains. Includes NoTrack's tracker list. 2016-02-09 20:43:45 +00:00
Mcat12
e37495d80b Merge pull request #294 from soukron/master
Replaced 'sudo' with $SUDO variable
2016-02-08 16:56:42 -05:00
Sergio G
beb6b950f7 Replaced 'sudo' with 2016-02-08 22:26:41 +01:00
Promofaux
2d1c0be24e fix reference to install log location. #282 2016-02-06 13:04:54 +00:00
Promofaux
9941651b3c Addresses changes as requested by @jacobsalmela in #282 2016-02-06 13:02:21 +00:00
Mcat12
31fda124f3 Add to contributor info 2016-02-05 17:29:38 +00:00
Adam Warner
b7f6498a5c Create CONTRIBUTING.md
Initial commit. Basic list, could probably do with some work....
2016-02-05 17:29:19 +00:00
Mcat12
282da1c2b6 Add to contributor info 2016-02-05 12:22:23 -05:00
Adam Warner
8e6ec6ef0c Create CONTRIBUTING.md
Initial commit. Basic list, could probably do with some work....
2016-02-05 15:50:15 +00:00
Adam Warner
704b3ee673 Merge pull request #286 from pi-hole/docsAPlusSupport
Add A+ to Raspberry Pi Platforms
2016-02-04 13:27:12 +00:00
Dan Schaper
c18a1c3eca Add A+ to Raspberry Pi Platforms
A+ Supported
2016-02-04 01:17:00 -08:00
Adam Warner
4e1870197e Merge pull request #285 from pi-hole/altInstallDocs
Add alternative installation method
2016-02-03 20:41:45 +00:00
Dan Schaper
3bf61cce95 Add alternative installation method
Add installation method for non-pipe installs
2016-02-03 10:53:23 -08:00
Jacob Salmela
68889b0544 Merge pull request #280 from CDeeRON/patch-1
ATV Hulu domain add
2016-02-02 11:46:13 -06:00
CDeeRON
8a90a47fc2 ATV Hulu domain add
added ads-e-darwin.hulu.com which I found to be used when serving ADs on ATV.
2016-02-02 12:20:30 -05:00
Adam Warner
c93c4cc5e6 Update basic-install.sh
ahem
2016-02-01 22:28:35 +00:00
Promofaux
06cba7defd Fix script output around new changes 2016-02-01 22:25:28 +00:00
Promofaux
8b76bbe51d Merge github.com:pi-hole/pi-hole 2016-02-01 22:19:37 +00:00
Promofaux
aa1d3a4c2e Fix logic in versionCheckDNSmasq, as dnsmasq.conf was being overwritten every time install was run. Fixes @kmr2319 's concern in #98 2016-02-01 22:19:17 +00:00
Adam Warner
66817411f9 Merge pull request #275 from pi-hole/development
Release 2.5
2016-02-01 09:53:25 +00:00
Adam Warner
23c3196935 Merge pull request #277 from pi-hole/cosmeticFix
Upstream DNS Whiptail changes
2016-02-01 07:55:52 +00:00
Dan Schaper
38e73a188a Fix array selection 2016-02-01 02:11:55 +00:00
Dan Schaper
3fdf588cc9 Costmetic fixes, change DynDNS to OpenDNS 2016-02-01 02:09:11 +00:00
Adam Warner
9412fe8a0a Delete version.txt
@mcat12 said it's not needed anymore.
2016-01-31 21:01:13 +00:00
Adam Warner
c6450e60e1 Update version.txt
Change version number to 2.5
2016-01-31 20:58:11 +00:00
Promofaux
8126e9f4b1 Merge branch 'master' into development 2016-01-31 20:48:19 +00:00
Promofaux
70e4104c17 Merge remote-tracking branch 'origin/development' 2016-01-31 20:47:10 +00:00
Promofaux
29e0e1760b Fixes #154 #269. No need for PR #214 any more. 2016-01-31 20:39:12 +00:00
Dan Schaper
442b7b4c4d Merge pull request #267 from pi-hole/CBH/UpstreamDNS
Upstream DNS is now user configurable. Configuration files are now stored in sub-directories instead of as replacements to the package configs.
2016-01-30 18:09:00 -08:00
Dan Schaper
548153fd5e Merge pull request #270 from ChadBHowell/patch-1
Add error checking for grep and correct typos
2016-01-30 17:53:20 -08:00
Chad Howell
5060ed8970 Add error checking for grep and correct typos 2016-01-30 20:51:28 -05:00
Dan Schaper
d18e064d21 Remove no longer needed change to config file
Config file moved, no longer needed command removed.
2016-01-30 16:30:38 -08:00
Mcat12
0cfb3c7ab4 Fixed config issue 2016-01-30 19:21:31 -05:00
Mcat12
2e0c2f2e77 Merge pull request #268 from pi-hole/licenseUpdate
Updated License
2016-01-30 15:21:53 -05:00
Mcat12
48f9a61ff0 Updated License 2016-01-30 15:12:40 -05:00
Mcat12
0042e3ae02 Merge branch 'development' into CBH/UpstreamDNS
Conflicts:
	automated install/basic-install.sh
2016-01-30 13:28:01 -05:00
Jacob Salmela
a1204cf246 splunk app 2016-01-30 12:36:56 -05:00
Mcat12
fc499d9e7c Merge pull request #266 from pi-hole/coverage
splunk app
2016-01-30 12:31:55 -05:00
Jacob Salmela
b83704dac2 splunk app 2016-01-30 10:20:01 -06:00
Adam Warner
b93e46de14 Update basic-install.sh 2016-01-30 14:55:02 +00:00
Promofaux
3c49aa9d9d Merge remote-tracking branch 'origin/master' into development 2016-01-30 14:38:49 +00:00
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