Commit Graph

3344 Commits

Author SHA1 Message Date
8a243c5872 Insert also old trust anchor
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-18 21:45:15 -05:00
b30b3f3aeb Update DNSSEC trust anchor
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-18 21:44:34 -05:00
2d3906450a add back in str local var, and change ticks to info on whitelist lines
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-18 20:14:53 +00:00
5ecc46d85b Accidentally too many spaces
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-16 14:03:12 +00:00
ddd6f3dbe5 Grammar changes. Lets not work out programmatically whether we need to pluralise a word. It's not needed.
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-16 13:55:52 +00:00
f5237db580 Merge pull request #1849 from pi-hole/fix/1826
Remove quotes from the uniqDomains array to actually whitelist the so…
2017-12-16 13:22:44 +00:00
761fd13a70 Remove quotes from the uniqDomains array to actually whitelist the sources
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-16 13:15:26 +00:00
e3fa06d7ff Merge pull request #1829 from keithbentrup/development
Must send HTTP headers before html
2017-12-13 13:37:32 -05:00
61a76f4493 Merge pull request #1836 from pi-hole/tweak/packageInstall
Change package install notification from CROSS to INFO.
2017-12-13 12:27:47 -05:00
c5f46702c8 Merge pull request #1840 from pi-hole/revert/GravityParseMethod
Revert parsing method to that of 3.1.4. New Method is allowing illega…
2017-12-12 17:49:36 +00:00
c24e5cd3f6 :codacy: :codacy2: :codacy3:
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-12 12:45:25 +00:00
cc3035267f Revert parsing method to that of 3.1.4. New Method is allowing illegal lists through, and that is causing issues such as blocking www.google.com. This method will just throw away invalid list entries.
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-12 12:36:09 +00:00
29ee8250e9 Change package install notification from CROSS to TICK.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-12-11 09:45:30 -08:00
47ed0b7627 Merge pull request #1830 from pi-hole/ops/stickler
Create .stickler.yml
2017-12-09 18:18:50 -08:00
423280cee1 Merge pull request #1817 from jjssoftware/development
pihole.log permissions
2017-12-09 14:15:12 -08:00
8c0faa0b9a Create .stickler.yml
Initial stickler yaml file.
2017-12-09 14:08:54 -08:00
45ab2a3d7a send HTTP headers before HTML
Signed-off-by: Keith Bentrup <keith@keithbentrup.com>
2017-12-09 17:03:20 -05:00
8804f5c423 Merge pull request #1825 from pi-hole/tweak/updatechecker
Tweak update checker
2017-12-09 13:58:16 -08:00
1078aa499c Merge pull request #1812 from pi-hole/fix/resolvconf
Try dig +short if getent hosts fails when running gravity
2017-12-09 13:57:48 -08:00
05d015169c Check for local version and branches every 10 minutes, check for remote versions only once a day
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-09 19:00:46 +01:00
6c9e7586d5 Merge pull request #1818 from pi-hole/fix/debug
Use systemctl or service commands in debug script
2017-12-08 19:57:37 -06:00
28bed0041e remove comment
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-12-08 18:29:28 -06:00
6f03e30151 fixes #1537 by checking if systemctl is found
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-12-08 18:23:55 -06:00
Joe
6085d6ffd1 Merge pull request #1 from jjssoftware/jjssoftware-patch-1
Jjssoftware patch 1
2017-12-08 22:38:22 +00:00
Joe
6ecd93d0c9 pihole.log permissions
This change makes pihole more friendly to the non-existence of the pihole.log file. This can help with systems that are configured to mount /var/log as a tmpfs volume. It may also help with systems where the pihole.log file is accidentally/unintentionally removed. 

Further discussion around the details of this change are in https://github.com/pi-hole/pi-hole/issues/1798
2017-12-08 22:25:01 +00:00
863ea7294f Merge pull request #1815 from pi-hole/release/3.2
Merge Release 3.2 in to development. GitFlow
2017-12-08 13:06:18 -08:00
af59824819 Merge pull request #1811 from bcambl/nmcli_check
check NetworkManager status prior to using the cli (#1653)
2017-12-08 06:38:42 -06:00
80e17ab721 potentially fixes #1806 by falling back to dig if getent fails
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-12-07 22:38:47 -06:00
f89d69b081 check NetworkManager status prior to using the cli (#1653)
Closes #1653

Signed-off-by: bcambl <blayne@blaynecampbell.com>
2017-12-07 21:43:14 -06:00
5ba413569e Merge pull request #1776 from pi-hole/release/3.2
Pi-hole core v3.2
v3.2
2017-12-06 21:37:10 -06:00
b3e969f000 Merge pull request #1797 from pi-hole/Ugh/Codacy
Ugh/codacy
2017-12-07 00:49:59 +00:00
a9a40ca46c Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead.
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 23:27:40 +00:00
79aada0b87 travis didn't like that
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:57:05 +00:00
162a7b56fe force mode is no longer referenced. Regression. Same with domToRemoveList
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:42:08 +00:00
69dc22c10f fix some codacy and intelliJ idea complaints
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:31:12 +00:00
9642cda949 Merge pull request #1792 from pi-hole/bugfix/lighttpdEnabled
Add in an extra check to enable lighttpd.
2017-12-06 16:31:26 -05:00
dd6a9a0b84 supress output of which command on centos/fedora as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155156819
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 15:28:58 +00:00
945dcc6c2b Indent two spaces as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155157116
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 15:17:31 +00:00
f60791ac7c Add dependencies as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155149349
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 14:42:01 +00:00
b64155a165 Add in an extra check to enable lighttpd.
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 14:32:39 +00:00
472f7725c7 Merge pull request #1779 from pi-hole/new/locallists
Add support for local blocking lists
2017-11-28 20:58:00 -05:00
90f01b5fc4 Merge pull request #1780 from pi-hole/fix/spacepasswd
Allow passwords with spaces
2017-11-23 23:42:54 -06:00
20a2daa114 Merge branch 'release/3.2' into fix/spacepasswd 2017-11-23 23:11:17 -06:00
9b6a2c7068 Merge pull request #1769 from pi-hole/tweak/readme
Use GH Pages images & update wording
2017-11-23 23:07:16 -06:00
0a4d3ef6e6 Add "sudo bash" to installation instructions
* Running as sudo/root prevents script from being re-downloaded, unintentionally side-stepping manual code review by end user

Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-11-23 13:35:51 +11:00
2dc1851892 Allow passwords with spaces
e.g: `pihole -a -p "foo bar"`

 Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-11-23 13:17:34 +11:00
8d721d086c Modify indentation 2017-11-21 18:37:38 -05:00
6f0bb30def Improve indentation
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-21 20:58:27 +01:00
c54f04ef4c Repair username:password filtering
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-21 20:55:47 +01:00
eb83081a5c Clarify error message: File could also have been of zero size
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-21 18:36:34 +01:00