Mcat12
d8bcbdadd6
Merge pull request #1133 from pi-hole/fix/gravity_collapse
...
Make sure to read all lines of adlists file
2017-01-13 17:11:33 -05:00
Mcat12
d196c13f2c
Merge pull request #1131 from pi-hole/chronometerJsonUnixTools
...
No excuse for chronometer not to match API
2017-01-13 16:34:51 -05:00
Dan Schaper
7ba251d3a6
Merge pull request #1136 from pi-hole/fix/installer_iptables
...
Check for existance of iptables command
2017-01-13 11:04:14 -08:00
DL6ER
0b72c639fb
Check for existance of iptables command. Fixes #1125
2017-01-13 18:13:10 +01:00
DL6ER
bd1c5a42e8
Allow multiple DNS servers
2017-01-13 17:49:55 +01:00
DL6ER
845d8c0e63
Ensure LC_NUMERIC=C is set when evaluating floating point number (non-English systems might expect "," as decimal separator
2017-01-13 12:59:49 +01:00
DL6ER
bcb8a52418
Added user to cron file
2017-01-13 11:57:07 +01:00
DL6ER
322cb2387b
Also accept the last line of the adlist file if there is no newline at the end
2017-01-13 11:02:51 +01:00
DL6ER
bfe56942f9
Merge pull request #1128 from pi-hole/DNSSEC
...
Add DNSSEC support to Pi-hole core
2017-01-13 10:54:25 +01:00
Promofaux
b4c32e47c6
Missed one!
2017-01-12 22:07:07 +00:00
Promofaux
248d8680f7
actual codacy complaints
2017-01-12 21:51:10 +00:00
Promofaux
1bda965a7c
Codacy complaints
2017-01-12 21:50:16 +00:00
Promofaux
2ee305769d
Replace all calculations with values read directly web admin API. Parse JSON using native unix tools, no additional requirements needed.
2017-01-12 21:23:58 +00:00
DL6ER
3a8a936575
Corrected path
2017-01-12 21:01:52 +01:00
DL6ER
6b6fbc4709
Remove --force on @reboot
2017-01-12 20:41:25 +01:00
DL6ER
3fd2ffd466
Add logrotate for pihole.log
2017-01-12 20:39:25 +01:00
DL6ER
b56ca2b834
Add DNSSEC support to Pi-hole core
2017-01-12 16:02:41 +01:00
DL6ER
10f77df8bb
Merge pull request #1065 from pi-hole/wildcardblacklisting
...
Add blacklisting wildcard support
2017-01-12 00:13:32 +01:00
Mcat12
df7671d393
Add a few comments and remove debug output
2017-01-11 18:01:27 -05:00
DL6ER
a263936243
Merge branch 'development' into wildcardblacklisting
2017-01-11 18:25:51 +01:00
DL6ER
11924d425b
Hide whitelist option if we detected that the domain as blocked due to wildcard blocking
2017-01-11 17:07:08 +01:00
DL6ER
0bd5a5f382
Merge pull request #1114 from pi-hole/tweak/debugger_show_branch_revision
...
Debugger: show branch + revision of repositories
2017-01-11 10:59:32 +01:00
Mcat12
757eb64be3
Merge pull request #1118 from pi-hole/cleanup/shellcheck
...
Cleanup/shellcheck
2017-01-10 19:29:49 -05:00
DL6ER
6b3aea933d
Add info that whitelisting blocked pages does not work
2017-01-09 15:02:31 +01:00
DL6ER
2935275227
Merge branch 'development' into wildcardblacklisting
2017-01-09 14:53:01 +01:00
Dan Schaper
cbe045b946
Merge remote-tracking branch 'origin/cleanup/shellcheck' into cleanup/shellcheck
...
# Conflicts:
# automated install/basic-install.sh
2017-01-09 00:17:15 -08:00
Dan Schaper
c58a95ca2e
setDNS whiptail direct, not in array.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:10:14 -08:00
Dan Schaper
80a3bce6d5
PI_HOLE_INSTALL_DIR global variable
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
`"${pw}"`
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Absolute path for pihole
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Debian PKG_INSTALL as array
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:10:06 -08:00
Dan Schaper
6f0289de49
Vestigial variable that was never populated.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:09:52 -08:00
Dan Schaper
0966d7660e
Take out some whiptail subshells that aren't needed.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Take out some whiptail subshells that aren't needed.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:09:45 -08:00
Dan Schaper
27e90cc4e6
Repetitive ip route get was resetting counts.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:09:39 -08:00
Dan Schaper
b785213c3a
Shellcheck for Test for $? -eq 0
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Shellcheck for Test for $? -eq 0
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:09:32 -08:00
Dan Schaper
642a73508d
Merge pull request #1119 from pi-hole/tweak/dry_installer
...
Repetitive `ip route get` was resetting counts.
2017-01-08 20:43:40 -08:00
Dan Schaper
8f7b023769
Shellcheck for Test for $? -eq 0
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-08 18:48:54 -08:00
Dan Schaper
a122fb2900
Shellcheck for Test for $? -eq 0
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-08 18:46:15 -08:00
Dan Schaper
a299a2cc5f
Repetitive ip route get was resetting counts.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-08 18:04:24 -08:00
Adam Warner
47196d86ad
Merge pull request #1115 from pi-hole/development
...
[RELEASE] Pi-hole Core 2.11.2
2017-01-08 23:22:26 +00:00
Mcat12
a713cf7952
Merge pull request #1116 from pi-hole/fix/multi_interface
...
Fix/multi interface
2017-01-08 17:57:29 -05:00
Dan Schaper
6cd7b8ff5e
Merge branch 'master' into fix/multi_interface
2017-01-08 14:54:46 -08:00
Dan Schaper
f8264f8277
Merge branch 'development' of github.com:pi-hole/pi-hole into development
2017-01-08 14:49:29 -08:00
Dan Schaper
0e4d5e9103
Bash splitting and globin
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-08 14:49:08 -08:00
trick77
f599bcfef9
Bugfix if multiple interfaces are present
2017-01-08 13:56:08 +01:00
DL6ER
74a4e62cc9
Codacy fix
2017-01-08 11:26:56 +01:00
DL6ER
63a414a544
Align outputs
2017-01-08 11:21:50 +01:00
DL6ER
7d1f5091a7
Fixed small typo
2017-01-08 11:21:10 +01:00
DL6ER
3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log
2017-01-08 11:17:25 +01:00
trick77
52d06d906e
Bugfix if multiple interfaces are present
2017-01-08 10:14:40 +01:00
DL6ER
d9e949b27c
Merge pull request #1096 from pi-hole/fix/updater
...
Fix updater failing on non-English systems
2017-01-06 23:36:42 +01:00
DL6ER
b65fe9d64f
Merge pull request #1099 from pi-hole/fix/webpageshtypo
...
Fixed typo in webpage.sh
2017-01-05 21:57:00 +01:00
DL6ER
168397e90d
Fixed typo in webpage.sh
2017-01-05 21:45:06 +01:00
