Commit graph

615 commits

Author SHA1 Message Date
ryt51V
3eb6739263 Installer and uninstaller now rerun themselves as root using sudo at the start of the script, rather than run individual commands with sudo. 2016-03-02 19:28:33 +00:00
Mcat12
6c58ea18dc Update README.md 2016-02-24 12:02:18 -05:00
Adam Warner
52549d51ab Update adlists.default
Add extra warning regarding mahakala.is list. See comment by @leichterleben in #341
2016-02-22 09:24:17 +00:00
Adam Warner
fe05ed13e5 Merge pull request #314 from pi-hole/development
Pi-hole v2.5.3
2016-02-21 21:04:16 +00:00
Adam Warner
3a46e7fc0a Merge pull request #338 from pi-hole/auto-chronometer-lcd-setup
Auto chronometer lcd setup
2016-02-21 20:48:46 +00:00
Adam Warner
88674e21cf Update gravity.sh
Clear out `pihole.*` files from `/etc/pihole` as they are no longer needed.
2016-02-21 20:45:56 +00:00
Adam Warner
a0673c7028 Update basic-install.sh
Increase required free bytes.
2016-02-21 20:38:05 +00:00
Mcat12
592af80659 Update adlists.default 2016-02-21 14:19:57 -05:00
Adam Warner
3ec9b3b021 Merge pull request #327 from pi-hole/slamanna212-development
Additional upstream DNS choices, plus ability to add custom upstream DNS
2016-02-21 18:40:34 +00:00
Promofaux
ca2d3a192c add double bracket notation to lines 396, 399, 403 . Fixes error raised by @jacobsalmela 2016-02-21 18:38:34 +00:00
Adam Warner
209bf7d746 Merge pull request #339 from pi-hole/adlist-changes
Adlist.default changes
2016-02-21 18:32:14 +00:00
Promofaux
13777cc1aa update default list to include StevenBlack's amalgamated list (remove seperate lists included in that list). Take advantage of new support for commenting and blank lines 2016-02-21 18:12:57 +00:00
Promofaux
bffc77e478 Add support for comments and blank lines in adlists.default/adlists.list 2016-02-21 17:45:25 +00:00
Promofaux
0ebb7eecdb Verify Custom DNS IP is a valid IP address 2016-02-20 17:33:20 +00:00
Jacob Salmela
99863bb799 pihole on ubuntu 14.04
Also moved a link from "coverage" into "projects" as it was more appropriate
2016-02-20 10:33:04 -06:00
Promofaux
800d2f0859 Add back in whiptail dialog to verifyFreeDiskSpace() 2016-02-20 16:17:29 +00:00
Promofaux
f397844603 Remove conflicted merge markup. Not sure how that got through. 2016-02-20 16:08:02 +00:00
Promofaux
2d895f328c Fix merge conflicts 2016-02-20 15:38:39 +00:00
Promofaux
b14b182084 change regex to test for one or more numbers, not 0 or more numbers. 2016-02-20 15:17:57 +00:00
Promofaux
8687d25d88 make prepopulation of freetext on custom DNS provider a bit more intelligent 2016-02-20 15:12:13 +00:00
Promofaux
7001edcd1d Change 'Other' to 'Custom', add explanation to whiptail. Convert spaces to tabs. 2016-02-20 15:00:03 +00:00
Mcat12
4a1e88f4bf Fixed Pi-hole user not being created 2016-02-20 09:48:06 -05:00
Promofaux
b41608d40b Include fix for regex in verifyFreeDiskSpace() 2016-02-20 14:44:56 +00:00
jacobsalmela
c5d45edf2d consoleblank=0
This makes sure the LCD screen does not go blank after a set period of
time.
2016-02-20 01:15:14 -06:00
jacobsalmela
0116b6341c updated script
Added links to where code was borrowed from
added reboot at the end
also added a few things commented out that might be useful for some
people to learn.
2016-02-20 01:14:48 -06:00
Adam Warner
3e7ecda80f Merge pull request #242 from ChadBHowell/CBH---pihole-system-user-v2
Add user pihole if user does not exsist
2016-02-19 09:31:41 +00:00
jacobsalmela
f0e5b2b6f9 Merge branch 'master' into auto-chronometer-lcd-setup 2016-02-18 16:45:47 -06:00
Jacob Salmela
5976ec9323 Merge pull request #330 from fayetted/Issue_322
Account for CHIP pc not having root on '/'
2016-02-17 17:42:32 -06:00
Adam Warner
eb3463fad1 Merge pull request #331 from pi-hole/master
Update Dev from master
2016-02-17 22:24:27 +00:00
Adam Warner
5f9e5869e9 Create ISSUE_TEMPLATE.md 2016-02-17 22:23:01 +00:00
Adam Warner
950480bb77 Update PULL_REQUEST_TEMPLATE.md 2016-02-17 22:20:01 +00:00
Adam Warner
6530ec58c7 Update PULL_REQUEST_TEMPLATE.md 2016-02-17 22:18:43 +00:00
Adam Warner
b1515c5e3f Rename PULL_REQUEST_TEMPLATE to PULL_REQUEST_TEMPLATE.md 2016-02-17 22:17:20 +00:00
Adam Warner
6581f119fd Update PULL_REQUEST_TEMPLATE 2016-02-17 22:16:04 +00:00
Adam Warner
9ad7c12710 Create PULL_REQUEST_TEMPLATE 2016-02-17 22:15:33 +00:00
Daniel Fayette
8e289215b4 Account for CHIP pc not having root on '/' 2016-02-17 10:00:36 -06:00
Adam Warner
3718c3be56 Merge pull request #328 from Hippyjake/development
closes #325
2016-02-17 12:51:03 +00:00
Adam Warner
c3c051385c Update basic-install.sh
Corrected mistake in previous commit
2016-02-17 12:42:31 +00:00
Hippyjake
21c688a8a8 add uptime -p to chrono script 2016-02-16 18:06:49 -07:00
Promofaux
668b883651 Merge branch 'fayetted-Issue_309' into slamanna212-development 2016-02-17 00:08:48 +00:00
Promofaux
c396aeed52 Correct miss-spelled variables on lines 398 and 403 2016-02-17 00:07:14 +00:00
Adam Warner
40f541bc31 update verifyFreeDiskSpace()...
addresses #322. Will now check free space on the first file system output by 'df- lkP`, as opposed to `/` to make pi-hole more compatible with other distros.
2016-02-16 23:00:48 +00:00
Daniel Fayette
44974f98a0 Merge remote-tracking branch 'upstream/development' into Issue_309 2016-02-16 16:57:04 -06:00
Adam Warner
b7cb3df9bc Merge pull request #305 from fayetted/Issue_304
Set file permisions on `/etc/pihole` directory. fixes #304
2016-02-16 22:54:54 +00:00
Daniel Fayette
432e6d5395 Cleaned up output, Fixed Cancel button 2016-02-16 16:47:36 -06:00
Daniel Fayette
fdf805bc7b Merged with @slamanna212 code to add 3 new DNS providers. 2016-02-16 16:38:06 -06:00
Promofaux
73e13f3875 Merge branch 'development' of https://github.com/slamanna212/pi-hole into slamanna212-development 2016-02-16 22:22:59 +00:00
slamanna212
da959e1296 Increased Size Of Whiptail Dialog
Increased Size of Whiptail Dialog to 5 to show all 5 DNS choices
2016-02-15 17:55:14 -05:00
slamanna212
94600c54cb Added Default State for New DNS Options
Added default state of off for 3 new DNS options to better match existing code
2016-02-15 17:54:17 -05:00
Mcat12
c4fc2e089d Removed dead list
Fixes #316
2016-02-15 17:36:59 -05:00