dc44fc9e27
Version check amalgamation and removal of && || logic.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 17:54:38 -08:00
6f2fb57c08
Protocol specific records checks.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 15:16:33 -08:00
2547cc4c8d
Only run IPv6 if enabled, split out Chaos TXT checks.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 15:06:34 -08:00
9f4ef66f41
Add IPv6 resolver test
2017-03-04 22:38:52 +01:00
086f0790fc
Add Google's IPv6 address for potential IPv6 resolver tests
2017-03-04 22:31:18 +01:00
709b44f736
IPv4 DNS tests
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 12:16:43 -08:00
6cd4ff6d68
Organize functions and function calls.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 12:16:32 -08:00
abd3e828de
Optimize normalOutput
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 07:46:00 -08:00
b85af50d14
Generate only the information that is actually asked for
2017-03-04 14:08:11 +01:00
0e8fd49669
Function...
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 23:30:57 -08:00
945e22874e
Collapse duplicate functions, and take out argument loops.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 23:12:28 -08:00
77ab47a984
Awk for perl
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 22:34:55 -08:00
ed8088f203
Functions for Core/Web version and hash. And only check first argument in each section.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 22:10:32 -08:00
8831b22fc8
Prototype function for getting version of local repo
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 21:36:38 -08:00
0341bd1758
Optimize code, undoc flag for current hash.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 20:32:26 -08:00
9bb4a5fb25
Factor out variables from display.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 20:16:53 -08:00
ebfffea5dc
Always show something, even if it's just the short hash of the latest commit.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 20:04:55 -08:00
81939ab265
Get short hash of local and remote
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 19:14:30 -08:00
f2fe84c9d3
Merge pull request #1292 from pi-hole/master
...
Merge patches back into devel
2017-03-03 23:45:29 +01:00
dd971b6ee5
Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)
2017-03-03 22:58:41 +01:00
f1b8abf503
Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked
...
[FTL] Show most recently blocked domain in chronometer
2017-03-03 12:20:43 +01:00
66b7d04b82
Merge branch 'development' into new/FTL-binary
2017-03-01 12:42:48 +01:00
7ba47f504c
Add special "except-interface" line in case of listening on all interfaces
2017-03-01 12:15:04 +01:00
0be1717ff4
Fix config error
2017-03-01 11:46:48 +01:00
189a4e0078
Add option to skip restarting of dnsmasq
2017-03-01 11:26:06 +01:00
3adf8785d8
Move "all" down in help text to not suggest that it is the default
2017-03-01 11:07:05 +01:00
b74862bfc5
Actually apply new setting by restarting dnsmasq
2017-03-01 11:02:08 +01:00
01273124ea
Change to -i, interface
2017-03-01 10:59:55 +01:00
721ada7e16
Fix typo
2017-03-01 10:52:21 +01:00
bd9dc91396
Add response for users manually setting this up via CLI
2017-03-01 10:50:13 +01:00
de6c43a8d3
Setup interface listening behavior of dnsmasq
2017-03-01 10:46:20 +01:00
83b0600863
Carriage return or newline based webcalls.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 11:03:57 -08:00
6c130b7960
Vebiage and highligh the token, also `:::`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 10:27:11 -08:00
7244d44a1d
Notify user that log is being uploaded.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 10:02:00 -08:00
9b060aab34
Debug auto mode engaged
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-26 18:22:06 -08:00
ce6c465942
Merge pull request #1266 from pi-hole/new/host-record
...
Add host-record option
2017-02-23 17:32:10 +01:00
7a1a2dec67
update license to EUPL on core files
2017-02-22 11:55:20 -06:00
7ed1bbad49
Add host-record option
2017-02-22 14:43:07 +01:00
078cc7660e
Improved updater logic
2017-02-22 11:00:45 +01:00
af2893d2ce
Updater implementation for FTL
2017-02-22 10:43:13 +01:00
a64211123f
Some debug additions
2017-02-21 16:46:54 +01:00
053b38e0bd
Set up for IP matching in detection.
2017-02-16 19:45:44 -08:00
2aa3a109a0
Ping gateways and Internet.
2017-02-16 18:38:05 -08:00
472708376d
Split out IP checks.
2017-02-16 18:30:15 -08:00
cfed3d59e9
Begin fixing IP detection functions.
2017-02-16 16:49:14 -08:00
af8e629df4
Merge pull request #1239 from pi-hole/tweak/debug48h
...
Change description as we want to save the debug log for 48h instead of only 24h
2017-02-10 20:46:12 +01:00
01f980d49c
Change description as we want to save the debug log for 48h instead of only 24h
2017-02-10 17:45:20 +01:00
99fab7e52a
Scan whole dnsmasq.d directory for cofigurations files
2017-02-10 17:42:37 +01:00
ba67144e34
Merge branch 'development' into adminPageAsOption
2017-02-09 16:27:07 -05:00
7785dac50e
Merge pull request #1228 from r0ckarong/development
...
Justify and improve help texts, add missing wildcard description
2017-02-08 14:05:53 +01:00
01f643e5eb
fixup! Fix spacing for wildcard help in list script
2017-02-08 12:56:28 +01:00
8037f3e332
Fix spacing for wildcard help in list script
2017-02-08 12:55:14 +01:00
afe5176e01
Justify help output to match main script
2017-02-08 12:41:53 +01:00
a48317883d
Fix indentation
2017-02-07 18:14:41 -05:00
4fcf8fd23f
Merge in `development` branch - resolve conflict in update.sh
2017-02-05 19:39:02 +00:00
10a30344e5
No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception.
2017-02-05 19:29:56 +00:00
b764d17c64
comment
2017-02-05 19:18:27 +00:00
ba0abdb88d
wrap update logic in admin_installed bool check
2017-02-05 19:12:09 +00:00
1428b58dde
source setupVars and only check admin repo if it is enabled
2017-02-05 19:07:04 +00:00
18eb8a2159
Merge pull request #1185 from pi-hole/cleanup/git_functions
...
Move git functions to one script
2017-01-31 19:05:53 -05:00
3239c7023a
Merge pull request #1170 from pi-hole/new/DHCPstaticleases
...
Backend changes for static DHCP leases
2017-01-31 21:07:36 +01:00
3d4516dc95
Improve regex
2017-01-29 20:27:20 +01:00
509c864cc3
Merge branch 'development' into fix/regex
2017-01-29 20:27:04 +01:00
f8944177a0
Fix chronometer interpreting summaryRaw
2017-01-29 13:32:48 -05:00
06873fe69e
Remove misplaced start of string expression. Fixes #1191
2017-01-29 13:54:39 +01:00
3d9d13222b
Use constants for leading paths.
2017-01-28 17:42:55 -08:00
745adabb05
Path to source basic-install.sh
2017-01-28 17:38:14 -08:00
3861b57dc6
Start moving reused utility functions to one script.
2017-01-28 17:32:42 -08:00
99a4a80017
Spelling
2017-01-28 17:08:38 -08:00
033ba26041
Stay in repo directory until we error check
2017-01-28 20:00:02 -05:00
08cddba200
There should be no echo here
2017-01-28 21:49:31 +01:00
1bf43b0425
Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain
2017-01-28 21:48:19 +01:00
85b3fef08d
Use perl instead of grep?
2017-01-28 00:39:10 +01:00
15037fa888
Typo
2017-01-28 00:17:32 +01:00
d595fef18f
Fix regex
2017-01-28 00:15:06 +01:00
be5fa22b6f
Merge pull request #1174 from pi-hole/tweak/logrotate_insecure_directory
...
Improve logrotate support
2017-01-27 11:18:06 -08:00
6fd7e0311c
Install customized version of logrotate script
2017-01-27 14:16:24 +01:00
1bcf2dd0fc
Tweak CLI domain filter
2017-01-27 00:45:57 +01:00
dad18dc5de
Changed keywords
2017-01-25 10:35:45 +01:00
5c95c4074b
Remove static leases from DHCP static leases file
2017-01-25 10:35:03 +01:00
4301b9a12a
Add static DHCP leases to new file
2017-01-25 10:33:25 +01:00
6a89c6bf3b
Silence rm warning if no DHCP server is used
2017-01-23 15:06:36 +01:00
fe8c365d17
codacy never lies
2017-01-22 20:53:30 +00:00
9acc3aac01
pipe `du -h` output to awk to ensure we only get the file size, and not the filename too. Yeah that's right Dom, pipe.
2017-01-22 20:44:07 +00:00
1ad23a065e
switch out `wc -l` with `grep -c ^`
2017-01-22 20:38:46 +00:00
de102fde5c
Add line count and size check for pihole.log
2017-01-22 20:38:09 +00:00
8bb9dd460b
Be able to disable the DHCP domain name
2017-01-18 12:22:03 +01:00
58f3ff69d8
Align comment with referenced line
2017-01-16 18:51:13 -05:00
72d8d10e64
Show most recently blocked domain in chronometer (using FTL). Fixes #717
2017-01-16 22:39:58 +01:00
63d02df0bc
Merge pull request #1130 from pi-hole/new/logrotate
...
Use logrotate for pihole.log
2017-01-16 15:11:11 -05:00
08f08fea61
Merge pull request #1135 from pi-hole/new/multipleDNSservers
...
Allow multiple DNS servers
2017-01-13 23:48:38 +01:00
1ed2a8637f
Removed debug echo's
2017-01-13 23:39:57 +01:00
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
bd1c5a42e8
Allow multiple DNS servers
2017-01-13 17:49:55 +01:00
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
b4c32e47c6
Missed one!
2017-01-12 22:07:07 +00:00
248d8680f7
actual codacy complaints
2017-01-12 21:51:10 +00:00
1bda965a7c
Codacy complaints
2017-01-12 21:50:16 +00:00
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
3a8a936575
Corrected path
2017-01-12 21:01:52 +01:00
3fd2ffd466
Add logrotate for pihole.log
2017-01-12 20:39:25 +01:00
b56ca2b834
Add DNSSEC support to Pi-hole core
2017-01-12 16:02:41 +01:00
a263936243
Merge branch 'development' into wildcardblacklisting
2017-01-11 18:25:51 +01:00
2935275227
Merge branch 'development' into wildcardblacklisting
2017-01-09 14:53:01 +01:00
74a4e62cc9
Codacy fix
2017-01-08 11:26:56 +01:00
63a414a544
Align outputs
2017-01-08 11:21:50 +01:00
7d1f5091a7
Fixed small typo
2017-01-08 11:21:10 +01:00
3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log
2017-01-08 11:17:25 +01:00
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
168397e90d
Fixed typo in webpage.sh
2017-01-05 21:45:06 +01:00
e3c1fcd2c6
NEW LOGIC FOR THE UPDATER
...
Compare local and remote hashes. Update is available if current remote hash is different from current local hash since we assume that local should never be newer than remote for user
2017-01-05 13:10:19 +01:00
200995bf29
Make IPv6 features of Pi-hole DHCP server switchable
2017-01-03 14:24:33 +01:00
3a90c1c192
Source setupVars.conf before trying to access variables
2017-01-03 13:34:01 +01:00
12bec1df68
Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
...
Major simplification of webpage.sh + extend DHCP to IPv6
2017-01-02 14:28:26 +00:00
ad61852804
Test against empty string
2017-01-02 11:10:38 +01:00
dbd8aee4ee
Add 'local' domain if not set in setupVers.conf
2017-01-02 11:08:54 +01:00
677694b01a
Set 24h lease time if settings was empty before
2017-01-02 11:05:40 +01:00
85f0241c0d
Reprocess DHCP settings after update
2017-01-02 10:50:59 +01:00
ebf0db4bbf
Typo fixed
2016-12-31 17:17:46 +00:00
9ac265980f
Add .conf to filename
2016-12-31 13:41:19 +00:00
40798da6b1
Add blacklisting wildcard support
2016-12-31 12:49:04 +00:00
fc596e41d4
All scripts set executable
2016-12-30 18:35:16 -08:00
5c7fc05a32
Enable DHCP logging by default
2016-12-30 16:31:57 +00:00
9181a4a1d8
Apply dhcp lease time also for IPv6
2016-12-29 14:26:23 +00:00
3268e1611a
Backend accept and apply dhcp lease time
2016-12-29 14:19:44 +00:00
cf724176dc
Do stateful DHCPv6 and SLAAC
2016-12-28 20:02:48 +00:00
1e627c7e8f
Make webpage.sh fully library style
2016-12-28 16:25:14 +00:00
9af26cbaac
Major simplification of webpage.sh
2016-12-28 02:14:47 +00:00
321ea8a3a9
Merge branch 'development' into webUIprivacymode
2016-12-27 21:27:11 +01:00
ef8292d371
Merge branch 'development' into updater_rewrite
2016-12-27 11:59:52 -08:00
e50947eb58
mend
2016-12-25 21:26:06 +01:00
ca056d32d2
Remove git -C
2016-12-25 21:22:59 +01:00
e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail()
2016-12-25 01:18:58 +01:00
5e28e6b9ac
Removed remaining git -C
2016-12-25 01:17:46 +01:00
3365ef7aaa
`is_repo()` returns values to caller, silence function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:54:04 -08:00
68c17b26dc
Bashisms
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:41:42 -08:00
e647efd471
Shell script, not javascript
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:24:20 -08:00
15db1ffdd5
Remove variables not needed any more
2016-12-24 15:48:43 +01:00
4632b0f797
Updated updater logic
2016-12-24 15:40:31 +01:00
65c35a5530
Use new subroutine to determine if updates are available
2016-12-24 15:32:25 +01:00
c449a1c0e0
Added GitCheckUpdateAvail()
2016-12-24 15:19:39 +01:00
b020010f0d
Removed some of the &> /dev/null
2016-12-24 15:08:30 +01:00
0276c72fe2
replace 'git -C' with long version (see #1009 )
2016-12-24 15:05:57 +01:00
04a9791be2
Save empty password
2016-12-23 23:41:40 +01:00
9a62026830
remove `DNS_BOGUS_PRIV` from setupVars.conf
2016-12-23 19:27:02 +00:00
ef1ce66793
Merge pull request #1013 from pi-hole/fix/chronometer
...
Fix chronometer.sh
2016-12-23 11:12:20 +00:00
3bc5d1bae0
Merge pull request #989 from pi-hole/APIresolveclientsandupstream
...
Implement backend for AdminLTE/#253
2016-12-23 10:37:48 +00:00
a4f58b0a22
Look for "query[" instead of "query" to avoid false-positives, like listed below
...
root@raspberrypi:/etc/.pihole# grep 'query' /var/log/pihole.log | grep -v 'query\['
Dec 22 16:29:50 dnsmasq[30801]: forwarded code.jquery.com to 208.67.222.222
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.com is <CNAME>
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 94.31.29.54
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 23.111.11.3
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 198.232.125.113
2016-12-22 19:09:37 +01:00
bcf8139708
Removed cat where we don't need it
2016-12-22 18:55:14 +01:00
9b0390c9da
Space to Tab
2016-12-22 18:53:44 +01:00
Dan Schaper
DL6ER
DL6ER
Jacob Salmela
Dan Schaper
Mcat12
Markus Napp
Promofaux
Dan Schaper
Adam Warner