b80edfb996
Add more informative link for Git Signoff
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-12-23 17:48:15 -08:00
e06543bd17
Merge pull request #1866 from pi-hole/fix/FTL_branch_version_display
...
Store fourth entry in versions/branches files
2017-12-23 11:32:57 -05:00
cca8412921
Use "echo -n" to avoid haveing newlines in the files
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-23 11:52:27 +01:00
d15a5ad5c1
Add required documentation in the source code
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-23 00:46:51 +01:00
8ed75dd176
Add extra entry to the end of the saved branches and versions such that PHP's explode() subroutine can correctly disentangle the first three entries and does not get confused by the newline character at the end of the FTL version/branch...
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-23 00:42:41 +01:00
d43ad263ea
Merge pull request #1863 from pi-hole/master
...
Sync with development branch
2017-12-22 22:00:49 +01:00
e602008459
Merge pull request #1856 from pi-hole/release/v3.2.1
...
Pi-hole core v3.2.1
2017-12-22 14:53:38 -06:00
322a18f0e6
Merge pull request #1861 from pi-hole/fix/DNSSEC_trustanchor
...
Merge `fix/DNSSEC_trustanchor` into `release/3.2.1` again
2017-12-21 11:03:05 -08:00
05eb749e66
Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor
2017-12-21 11:00:21 -08:00
7e8d31a62c
Merge pull request #1860 from pi-hole/smarterNotHarder
...
Merge `smarterNotHarder` into `release/3.2.1` again
2017-12-21 10:59:55 -08:00
8ca0582afc
Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor
2017-12-21 10:56:37 -08:00
b9f5fca546
Merge branch 'release/v3.2.1' into smarterNotHarder
2017-12-21 10:53:40 -08:00
5c2dcb5e74
Enable dnsmasq's extra logging feature
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-21 16:42:55 +01:00
3ef4af9326
Merge pull request #1857 from pi-hole/tweak/randomize_updatechecker
...
Randomize update checker time
2017-12-21 13:28:03 +01:00
f89f7ecd3e
Randomize GitHub API update check time
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-21 12:42:47 +01:00
be0c457445
Sleep 30 seconds after reboot to be sure that the system is ready
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-21 12:42:28 +01:00
3c04dbb4ed
Update remote version at 17:59 as well as on reboot
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-21 12:33:08 +01:00
cfca367eef
Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-")
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-18 21:45:24 -05:00
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
6085d6ffd1
Merge pull request #1 from jjssoftware/jjssoftware-patch-1
...
Jjssoftware patch 1
2017-12-08 22:38:22 +00:00
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
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
Dan Schaper
Mark Drobnak
DL6ER
DL6ER
Jacob Salmela
Adam Warner
Adam Warner
Dan Schaper
Keith Bentrup
Jacob Salmela
Joe
bcambl