Patrick O'Brien
|
94f15f1b3c
|
Merge remote-tracking branch 'upstream/development' into development
|
2017-03-23 18:47:50 -04:00 |
|
Patrick O'Brien
|
ee296f36c1
|
mask password input on command line
|
2017-03-23 18:47:30 -04:00 |
|
Mcat12
|
fb3e6ee35c
|
Source setupVars before attempting to use it
Fixes #1347
|
2017-03-21 18:01:51 -04:00 |
|
Dan Schaper
|
2740c68a63
|
Merge pull request #1335 from pi-hole/tweak/debug_templog
Debugging tweaks for temporary logfiles
|
2017-03-16 23:35:15 -07:00 |
|
Dan Schaper
|
b1f769b671
|
Output cleaning, IP stack check headers.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-15 23:50:29 -07:00 |
|
Dan Schaper
|
77378da70a
|
Cat out temp files to final log.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-15 23:43:41 -07:00 |
|
Dan Schaper
|
160030b75f
|
Quiet systemctl output to just the current daemon status.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-15 23:27:18 -07:00 |
|
Dan Schaper
|
0a0c3a2fb7
|
Copy working temp to final location.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-15 23:20:12 -07:00 |
|
Dan Schaper
|
e9f1ca338f
|
Create temp files for working storage, log to working storage temps.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-15 22:49:47 -07:00 |
|
Adam Warner
|
cfaf1ac67c
|
add check on file_parse to not include WEBPASSWORD= in the debug log
|
2017-03-15 18:59:41 +00:00 |
|
Adam Warner
|
6b862dd9e9
|
Only remove from wildcard list if domain is being added to whitelist or blacklist
|
2017-03-13 20:38:34 +00:00 |
|
Markus Napp
|
bb7a7d94ef
|
Replace misleading letter variable
|
2017-03-12 16:16:45 +01:00 |
|
Markus Napp
|
9a475cc010
|
Rewrite help text for better handling of params
|
2017-03-12 15:50:48 +01:00 |
|
Markus Napp
|
ae30c285a2
|
Fix handling of wildcard help text
|
2017-03-12 15:45:11 +01:00 |
|
Dan Schaper
|
2e74219ff9
|
Merge pull request #1313 from pi-hole/new/piholecheckout
Checkout adjustments
|
2017-03-11 13:01:11 -08:00 |
|
Dan Schaper
|
b0ae954f1e
|
Only update when update flag is set to "true"
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-11 12:37:36 -08:00 |
|
Dan Schaper
|
a2404f104a
|
Just some style and linting. And a cd in fetch_checkout_pull_branch
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-11 12:21:15 -08:00 |
|
DL6ER
|
38547ced7a
|
Can only diff once upstream branch is tracked
|
2017-03-11 16:55:37 +01:00 |
|
DL6ER
|
9a9d9007cd
|
Add missing "== true"
|
2017-03-11 16:49:47 +01:00 |
|
DL6ER
|
bd2d81f691
|
source setupVars.conf to see if INSTALL_WEB is true or not
|
2017-03-11 16:46:52 +01:00 |
|
DL6ER
|
1b9e7fbf2e
|
Test if branch is locally available is not reliable because of possible ambiguities
|
2017-03-11 16:40:10 +01:00 |
|
DL6ER
|
d4a49d192f
|
Correct variable name
|
2017-03-11 16:38:28 +01:00 |
|
DL6ER
|
8cb66544d2
|
Remove "\ "
|
2017-03-11 16:36:54 +01:00 |
|
DL6ER
|
140ac192aa
|
The web repo might actually be missing and this is n error (not installed because the user didn't want it)
|
2017-03-11 16:30:58 +01:00 |
|
DL6ER
|
b961b13d60
|
Small bugfix
|
2017-03-11 16:27:00 +01:00 |
|
DL6ER
|
febdb4a190
|
Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all)
|
2017-03-11 16:24:13 +01:00 |
|
DL6ER
|
1d60b62e7a
|
Testing alternative way of fetching/checking out of a single branch
|
2017-03-11 16:11:23 +01:00 |
|
Dan Schaper
|
41e1e4cb68
|
Rearrange pull logic, some optimization.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-10 11:25:35 -08:00 |
|
Dan Schaper
|
d5b88e0df8
|
Get the right name for the options.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-10 11:07:58 -08:00 |
|
Dan Schaper
|
20fd61468d
|
Require branch to check out
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-10 11:04:37 -08:00 |
|
Dan Schaper
|
0a0d25dff4
|
Script runs in subshell, no need to cd back to pwd.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-10 10:57:46 -08:00 |
|
DL6ER
|
2b3afbfef8
|
Merge pull request #1310 from pi-hole/new/piholecheckout
Pi-hole checkout feature
|
2017-03-09 00:43:35 +01:00 |
|
DL6ER
|
81a1057cac
|
Fix something Dan has overlooked
|
2017-03-09 00:30:36 +01:00 |
|
DL6ER
|
fd310c6445
|
Back to how we had it before, because --unshallow does not work at all
|
2017-03-09 00:28:02 +01:00 |
|
Dan Schaper
|
a9b52518bf
|
Shift numbers for argument identifiers, functions are called after shift
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-08 14:29:51 -08:00 |
|
Dan Schaper
|
87da40068c
|
Always exited with value 1, now exits with proper value.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-08 14:18:08 -08:00 |
|
Dan Schaper
|
b8f1eadb7f
|
Shift off checkout from being passed to script from pihole
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-08 14:17:56 -08:00 |
|
Dan Schaper
|
b522d8eaf6
|
Source and reuse existing variables, centralize code.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-08 13:41:11 -08:00 |
|
Dan Schaper
|
89ff99322d
|
Don't need to remember pwd inside a function, calling function doesn't change directories.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-08 13:30:08 -08:00 |
|
Dan Schaper
|
56e17d1010
|
Source functions and variables from basic-install.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-08 13:28:24 -08:00 |
|
DL6ER
|
d2ab0694b7
|
Add "master" shortcut
|
2017-03-08 13:18:34 +01:00 |
|
DL6ER
|
8a14a63d5d
|
Pi-hole checkout feature
|
2017-03-08 13:16:40 +01:00 |
|
DL6ER
|
8235b18854
|
Remove duplicated line
|
2017-03-08 12:09:34 +01:00 |
|
DL6ER
|
e0e9ebbe74
|
Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface
Don't try to obtain version of web interface it it is not installed
|
2017-03-07 23:54:32 +01:00 |
|
DL6ER
|
10bc8414b9
|
Move FTL querying before clearing the terminal to avoid flashing on Pi B+
|
2017-03-07 18:10:05 +01:00 |
|
DL6ER
|
4e25e0dc5c
|
Add missing } to JSON output
|
2017-03-07 17:57:57 +01:00 |
|
DL6ER
|
b1a9793d94
|
Let Chronometer query all data from FTL (no need for having the API). Fixes #1305
|
2017-03-07 17:54:11 +01:00 |
|
DL6ER
|
6dea00668e
|
Don't try to obtain version of web interface it it is not installed. Fixes #1303
|
2017-03-07 13:08:01 +01:00 |
|
DL6ER
|
ae9182c92e
|
Merge pull request #1301 from pi-hole/fix/removewildcard
Remove wildcard entry when adding the very same domain either the white- or blacklist
|
2017-03-06 23:53:06 +01:00 |
|
DL6ER
|
cf31561267
|
Remove wildcard entry when adding the very same domain either the white- or blacklist
|
2017-03-06 16:25:35 +01:00 |
|
DL6ER
|
a97f0b1298
|
Merge pull request #1300 from pi-hole/fix/deletehostrecord
Bugfix for when deleting host-record
|
2017-03-06 16:16:42 +01:00 |
|
Dan Schaper
|
d1e0f3ae18
|
Merge pull request #1294 from pi-hole/tweak/debugDNS
Tweak DNS debugging
|
2017-03-06 05:50:37 -08:00 |
|
DL6ER
|
47a6786e8f
|
Use proper test syntax
|
2017-03-06 14:02:56 +01:00 |
|
DL6ER
|
a69fcbb91e
|
Bugfix for when deleting host-record
|
2017-03-06 13:44:13 +01:00 |
|
Dan Schaper
|
8e2b51b391
|
Merge pull request #1296 from pi-hole/fix/debugVersion
Debug version detection improvements
|
2017-03-05 07:13:41 -08:00 |
|
Dan Schaper
|
560af43204
|
Merge pull request #1293 from pi-hole/fix/version
Account for hash in versioning
|
2017-03-05 07:10:18 -08:00 |
|
DL6ER
|
baefec86f2
|
Add CLI teleporter feature
|
2017-03-05 14:08:44 +01:00 |
|
Dan Schaper
|
512c650441
|
Shellchecking.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-04 19:07:55 -08:00 |
|
Dan Schaper
|
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 |
|
Dan Schaper
|
6f2fb57c08
|
Protocol specific records checks.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-04 15:16:33 -08:00 |
|
Dan Schaper
|
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 |
|
DL6ER
|
9f4ef66f41
|
Add IPv6 resolver test
|
2017-03-04 22:38:52 +01:00 |
|
DL6ER
|
086f0790fc
|
Add Google's IPv6 address for potential IPv6 resolver tests
|
2017-03-04 22:31:18 +01:00 |
|
Dan Schaper
|
709b44f736
|
IPv4 DNS tests
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-04 12:16:43 -08:00 |
|
Dan Schaper
|
6cd4ff6d68
|
Organize functions and function calls.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-04 12:16:32 -08:00 |
|
Dan Schaper
|
abd3e828de
|
Optimize normalOutput
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-04 07:46:00 -08:00 |
|
DL6ER
|
b85af50d14
|
Generate only the information that is actually asked for
|
2017-03-04 14:08:11 +01:00 |
|
Dan Schaper
|
0e8fd49669
|
Function...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-03 23:30:57 -08:00 |
|
Dan Schaper
|
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 |
|
Dan Schaper
|
77ab47a984
|
Awk for perl
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-03 22:34:55 -08:00 |
|
Dan Schaper
|
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 |
|
Dan Schaper
|
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 |
|
Dan Schaper
|
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 |
|
Dan Schaper
|
9bb4a5fb25
|
Factor out variables from display.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-03 20:16:53 -08:00 |
|
Dan Schaper
|
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 |
|
Dan Schaper
|
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 |
|
DL6ER
|
f2fe84c9d3
|
Merge pull request #1292 from pi-hole/master
Merge patches back into devel
|
2017-03-03 23:45:29 +01:00 |
|
DL6ER
|
dd971b6ee5
|
Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)
|
2017-03-03 22:58:41 +01:00 |
|
DL6ER
|
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 |
|
DL6ER
|
66b7d04b82
|
Merge branch 'development' into new/FTL-binary
|
2017-03-01 12:42:48 +01:00 |
|
DL6ER
|
7ba47f504c
|
Add special "except-interface" line in case of listening on all interfaces
|
2017-03-01 12:15:04 +01:00 |
|
DL6ER
|
0be1717ff4
|
Fix config error
|
2017-03-01 11:46:48 +01:00 |
|
DL6ER
|
189a4e0078
|
Add option to skip restarting of dnsmasq
|
2017-03-01 11:26:06 +01:00 |
|
DL6ER
|
3adf8785d8
|
Move "all" down in help text to not suggest that it is the default
|
2017-03-01 11:07:05 +01:00 |
|
DL6ER
|
b74862bfc5
|
Actually apply new setting by restarting dnsmasq
|
2017-03-01 11:02:08 +01:00 |
|
DL6ER
|
01273124ea
|
Change to -i, interface
|
2017-03-01 10:59:55 +01:00 |
|
DL6ER
|
721ada7e16
|
Fix typo
|
2017-03-01 10:52:21 +01:00 |
|
DL6ER
|
bd9dc91396
|
Add response for users manually setting this up via CLI
|
2017-03-01 10:50:13 +01:00 |
|
DL6ER
|
de6c43a8d3
|
Setup interface listening behavior of dnsmasq
|
2017-03-01 10:46:20 +01:00 |
|
Dan Schaper
|
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 |
|
Dan Schaper
|
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 |
|
Dan Schaper
|
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 |
|
Dan Schaper
|
9b060aab34
|
Debug auto mode engaged
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-26 18:22:06 -08:00 |
|
DL6ER
|
ce6c465942
|
Merge pull request #1266 from pi-hole/new/host-record
Add host-record option
|
2017-02-23 17:32:10 +01:00 |
|
Jacob Salmela
|
7a1a2dec67
|
update license to EUPL on core files
|
2017-02-22 11:55:20 -06:00 |
|
DL6ER
|
7ed1bbad49
|
Add host-record option
|
2017-02-22 14:43:07 +01:00 |
|
DL6ER
|
078cc7660e
|
Improved updater logic
|
2017-02-22 11:00:45 +01:00 |
|
DL6ER
|
af2893d2ce
|
Updater implementation for FTL
|
2017-02-22 10:43:13 +01:00 |
|
DL6ER
|
a64211123f
|
Some debug additions
|
2017-02-21 16:46:54 +01:00 |
|
Dan Schaper
|
053b38e0bd
|
Set up for IP matching in detection.
|
2017-02-16 19:45:44 -08:00 |
|