John Wiebalk
|
eddca8f127
|
Correct path for automated installer
basic-install.sh is in the `automated install` dir instead of `automated_installer`
|
2017-01-19 21:40:52 -05:00 |
|
Dan Schaper
|
cef0211c00
|
Merge pull request #1151 from pi-hole/fix/CIDR
Include CIDR notation for IPv4 non-natural blocks.
|
2017-01-19 14:02:28 -08:00 |
|
Dan Schaper
|
86052540d9
|
Add back CIDR notation for non-natural blocks. Includes multi-address
configs.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-01-19 13:50:42 -08:00 |
|
DL6ER
|
930cb15e2c
|
Merge pull request #1150 from pi-hole/tweak/DHCPdomain
Be able to disable the DHCP domain name
|
2017-01-18 14:23:30 +01:00 |
|
DL6ER
|
8bb9dd460b
|
Be able to disable the DHCP domain name
|
2017-01-18 12:22:03 +01:00 |
|
Mcat12
|
8a3c78ca0a
|
Merge pull request #1148 from pi-hole/fix/installer_array
Fedora dependency installer fix
|
2017-01-17 17:44:21 -05:00 |
|
Dan Schaper
|
62a5e36afd
|
Remove firewall configuration from update portion of script.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-01-17 14:40:30 -08:00 |
|
Dan Schaper
|
00b28f0aed
|
IPTables Whiptal option to install.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-01-17 14:19:19 -08:00 |
|
Dan Schaper
|
7c94aa9f07
|
Merge branches 'development' and 'fix/installer_array' of https://github.com/pi-hole/pi-hole into fix/installer_array
|
2017-01-17 13:05:51 -08:00 |
|
Dan Schaper
|
ec8c40b69b
|
Fix array declaration for Fedora package management.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-01-17 13:00:17 -08:00 |
|
Mcat12
|
2981f3cbd1
|
Merge pull request #1147 from pi-hole/uncommentLine391
Uncomment gravity.sh line 391
|
2017-01-17 15:26:43 -05:00 |
|
Promofaux
|
c2e1819098
|
This should not have been commented out. It's stopping any changes we make to the default lists getting out.
|
2017-01-17 19:48:20 +00:00 |
|
Mcat12
|
58f3ff69d8
|
Align comment with referenced line
|
2017-01-16 18:51:13 -05:00 |
|
DL6ER
|
72d8d10e64
|
Show most recently blocked domain in chronometer (using FTL). Fixes #717
|
2017-01-16 22:39:58 +01:00 |
|
Mcat12
|
63d02df0bc
|
Merge pull request #1130 from pi-hole/new/logrotate
Use logrotate for pihole.log
|
2017-01-16 15:11:11 -05:00 |
|
Mcat12
|
f579fd3895
|
Merge pull request #1143 from pi-hole/fix/ignore_down
Only ignore DOWN interfaces, `tun` interfaces are UNKNOWN.
|
2017-01-15 19:19:07 -05:00 |
|
Dan Schaper
|
34df34ba27
|
Actually rm the Pi-hole scripts.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-01-14 20:16:27 -08:00 |
|
Dan Schaper
|
2689b37c35
|
Combine multiple calls to interface length code.
&& ||
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-01-14 19:40:29 -08:00 |
|
Dan Schaper
|
9b6427144f
|
|| && conversion.
Fedora deps array.
Use full name of `source`
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-01-14 19:39:37 -08:00 |
|
Dan Schaper
|
9212eea8bd
|
Only ignore DOWN interfaces, tun interfaces are UNKNOWN.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-01-14 15:25:42 -08:00 |
|
Mcat12
|
6de5d6dd0a
|
Merge pull request #1113 from trick77/multi-if-fix
Bugfix if multiple interfaces are present
|
2017-01-13 18:28:23 -05:00 |
|
DL6ER
|
08f08fea61
|
Merge pull request #1135 from pi-hole/new/multipleDNSservers
Allow multiple DNS servers
|
2017-01-13 23:48:38 +01:00 |
|
DL6ER
|
1ed2a8637f
|
Removed debug echo's
|
2017-01-13 23:39:57 +01:00 |
|
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 |
|