Commit graph

2474 commits

Author SHA1 Message Date
WaLLy3K
1f3db8b602 Confirm Tricorder is online
* Scan port 9998 to confirm the availability of "tricorder.pi-hole.net"
* Exit codes for upload process
2017-05-18 12:43:17 +10:00
WaLLy3K
075f00cecd Merge branch 'development' into tc-insecure-optout 2017-05-16 09:49:42 +10:00
WaLLy3K
b9f2ba0717 Wording changes and bug fix 2017-05-16 09:48:46 +10:00
Adam Warner
ed04be5faa Merge pull request #1468 from pi-hole/tweak/help-output
New Help Output
2017-05-14 16:46:58 +01:00
Adam Warner
90119c75d5
more merge conflicts! 2017-05-14 16:43:20 +01:00
Dan Schaper
d30056026b Merge pull request #1466 from pi-hole/doclist_remove_sed
Document `sed` substitution for user readability
2017-05-14 08:28:10 -07:00
Adam Warner
bc8a5916d8
fix merge conflicts 2017-05-14 16:17:04 +01:00
Dan Schaper
f202602f99 Merge pull request #1470 from pi-hole/tweak/taco
Update PullApprove rules
2017-05-14 07:41:07 -07:00
DL6ER
69f361a3a1
🌮 is the new :shipit: squirrel 2017-05-14 16:28:35 +02:00
WaLLy3K
da9ff0cc66 Tricorder: Insecure Opt-out
* Check to see if Tricorder is being called directly
* Provide opt-out for insecure transmission of debug log
* Remove mention of internal function from help menu
2017-05-14 19:27:14 +10:00
WaLLy3K
703ff09a91 Merge pull request #1464 from pi-hole/new/tricorder_option
Tricorder debug logs are now uploaded using SSL when `openssl` is available
2017-05-14 15:37:25 +10:00
WaLLy3K
30035ce1c2 Merge branch 'development' into tweak/help-output 2017-05-14 13:03:33 +10:00
WaLLy3K
39b74ebfd4 Show help for "pihole checkout --help" 2017-05-14 12:22:19 +10:00
WaLLy3K
3bd677c102 Show help for "pihole -v -h"
* Indent output text
* Minor help text change
2017-05-14 11:57:46 +10:00
WaLLy3K
4eb7d2868c Fix "pihole disable --help" and "pihole -l --help" 2017-05-14 11:53:40 +10:00
WaLLy3K
0e4473685b Show help for "pihole -a -i --help" 2017-05-14 11:47:56 +10:00
WaLLy3K
b721ed49ab Update Help Output (#1467)
* File consistency

* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals

* Standardise core help text

* Added help text for disable command
* Added help text for logging command

* Clean up

* Fixed certain new lines and spaces

* Sync with development branch

* Formatting consistency

* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces

* Admin help text

* Added help text for interface command

* Sync with development branch

* Formatting consistency

* Tabs to 2 spaces
* Fixed some wording
* Fixed certain spaces

* Formatting consistency

* Minor wording changes
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces

* Blacklist help text

* Formatting consistency

* Tabs to 2 spaces
* Corrected indenting

* Cronometer help text

* Formatting consistency

* Fixed certain newlines and spaces
* Corrected indenting

* Checkout warning alteration

* Add checkout help text

* Corrected help output
2017-05-14 11:11:44 +10:00
Dan Schaper
25601b9fcc Document sed substitution for user readability
Comment the oneliner with explanations of what each step does.
2017-05-13 17:49:58 -07:00
Dan Schaper
db10c8ab46 Merge pull request #1465 from pi-hole/busybox_sed_support
Update list.sh for busybox compatibility
2017-05-13 17:40:27 -07:00
Adam Hill
55f78e3b64 Update list.sh
I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)
2017-05-13 18:44:41 -05:00
DL6ER
7abf349730
Use echo "ABC" | pihole tricorder to upload to Pi-hole's medical tricorder. Uses SSL if available. 2017-05-13 21:08:21 +02:00
Hans Geiblinger
b166410cbf Solve piholeLogFlush.sh having to be issued 2 x to clear logs (#1460)
Simplified the command -v syntax, and added a sleep 3 timer to the first execution of the log rotation. The second execution was being issued while the first was still running, thus it would fail and you would have to issue the "Flush Logs" command a second time.
2017-05-12 22:39:55 +02:00
0412465564
31d5a7ae9e whitelist on website blocked doesnt work (#1452)
Since Pi-hole redirects ad domains to itself, accessing the script via de.ign.com is the same as pi.hole in this case. The fix should be as simple as adding a / before admin on this line.
2017-05-12 22:29:07 +02:00
Dan Schaper
5bb91759b4 Merge pull request #1459 from WaLLy3K/patch-2
Provide remote hashes for version.sh
2017-05-12 12:38:13 -07:00
Dan Schaper
80c4b7c9bb Merge pull request #1455 from pi-hole/tweak/logecho_gateway
Debug: Log and echo gateway responses
2017-05-12 12:02:21 -07:00
WaLLy3K
ea0a9ceb37 Provide remote hashes for version.sh
* Provide remote hashes for comparison
 * Use double braces for all conditions (for consistency)
 * Suppress potential "cd" error output
 * Provide "not applicable" output upon any hash request for FTL
2017-05-12 15:25:01 +10:00
Dan Schaper
68dd2a6b91 Merge pull request #1447 from WaLLy3K/patch-1
Display FTL version & version.sh rewrite
2017-05-11 14:23:59 -07:00
Dan Schaper
e23c6899e0 Merge pull request #1456 from WaLLy3K/patch-3
Update queryFunc() to search Whitelist
2017-05-11 03:45:40 -07:00
WaLLy3K
c35c7b2cea Wrap in double brackets 2017-05-11 20:21:23 +10:00
WaLLy3K
58353e2839 Update queryFunc() to search Whitelist
If there is a match in Whitelist/Blacklist/Wildcards, `[ ! -t 1 ]` will cause the search to end if the terminal is closed when the script is called. This has the intended effect of allowing a user to search for a W/B/W domain (as well as all the adlists it's found in) using `pihole -q` via Terminal, but the script will stop searching after a W/B/W match when called by the block page.
2017-05-11 19:58:35 +10:00
Adam Warner
5e0572637e Merge pull request #1417 from WaLLy3K/tweak/queryFunc
QueryFunc() rewrite
2017-05-11 09:07:00 +01:00
Dan Schaper
501b26decd Log and echo gateway responses 2017-05-10 22:08:06 -07:00
WaLLy3K
c6596f2c54 Modified syntax to be valid for Shellcheck 2017-05-11 14:19:13 +10:00
WaLLy3K
2863308090 Minimise string duplication & other minor changes
Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().
2017-05-11 13:34:58 +10:00
WaLLy3K
7fef1fdc83 Fixed indentation 2017-05-11 10:11:04 +10:00
WaLLy3K
3081c151bd Perform EXACT searches on HOSTS lists correctly
`\s` on the end may be overkill, but it is the existing scanList() behaviour.
2017-05-11 09:13:32 +10:00
Dan Schaper
c793295be0 Merge pull request #1446 from pi-hole/tweak/install_lockcheck
Clarify error message on apt failures.
2017-05-10 15:40:13 -07:00
WaLLy3K
fe0a35cc7a Update -h to work as --hash
Also provide error output as per https://github.com/pi-hole/pi-hole/pull/1447#issuecomment-300600093
2017-05-11 08:30:49 +10:00
Dan Schaper
0b67eebaec Merge pull request #1440 from pi-hole/revert-1437-blockPage
Revert "Ensure any changes to blocking page are updated."
2017-05-10 15:26:29 -07:00
WaLLy3K
03201e2f20 Display FTL version & version.sh rewrite
While testing to make sure `pihole -v` would output `pihole-FTL version`, I noticed some options didn't work how I expected them to. For example, if I use `pihole -v -p`, I would expect to see the version output of Pi-hole Core. Instead, I'm informed that it's an invalid option.

I've had the following things in mind while rewriting this:
  * I'm operating under the assumption that FTL is only installed if the Admin Console is (Line 113 exit 0)
  * I have modified the help text to only output with `pihole -v --help`
  * I have modified all output to be more similar to the output style of `grep` and `curl` (Ditching ":::")

Testing output:
```
w3k@MCT:~$ pihole -v
  Pi-hole version is v3.0.1-14-ga928cd3 (Latest: v3.0.1)
  Admin Console version is v3.0-9-g3760482 (Latest: v3.0.1)
  FTL version is v2.6.2 (Latest: v2.6.2)
w3k@MCT:~$ pihole -v -c
  Current Pi-hole version is v3.0.1-14-ga928cd3
  Current Admin Console version is v3.0-9-g3760482
  Current FTL version is v2.6.2
w3k@MCT:~$ pihole -v -l
  Latest Pi-hole version is v3.0.1
  Latest Admin Console version is v3.0.1
  Latest FTL version is v2.6.2
w3k@MCT:~$ pihole -v -p --hash
  Current Pi-hole hash is a928cd3
w3k@MCT:~$ pihole -v -a --hash
  Current Admin Console hash is 3760482
w3k@MCT:~$ pihole -v --help
Usage: pihole -v [REPO | OPTION] [OPTION]
Show Pi-hole, Web Admin & FTL versions
  <Shows all Repositories and Options>
w3k@MCT:~$ pihole -v -foo
  Invalid Option!
```
2017-05-10 13:07:56 +10:00
Dan Schaper
dfc32b26a6
We test for dpkg lock on line 830 directly, no need for the check also
in the template section.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-05-09 13:11:28 -07:00
Adam Warner
89fd962615 Revert "Ensure any changes to blocking page are updated." 2017-05-06 11:45:31 +01:00
Adam Warner
a928cd3fa1 Merge pull request #1437 from pi-hole/blockPage
Ensure any changes to blocking page are updated.
2017-05-06 01:06:22 +01:00
Dan Schaper
f190a6ebc5 Merge pull request #1436 from pi-hole/fix/dhcpcd-localhostNS
Update basic-install.sh dhcpcd.conf nameserver
2017-05-05 15:25:12 -07:00
Adam Warner
9beb9fd941 Merge pull request #1384 from pi-hole/checkoutImprovements
Stash changes when switching branches
2017-05-05 23:22:54 +01:00
Adam Warner
525a1228c3
clarify 2017-05-05 22:43:37 +01:00
Adam Warner
19fd25c7cd
revert line, looks tidyer 2017-05-05 22:40:10 +01:00
Adam Warner
5b0927ca4b
tidy up output 2017-05-05 22:32:27 +01:00
Adam Warner
324d4433c3
even further simplify 2017-05-05 22:31:31 +01:00
Adam Warner
615ca56ea3
fix inteliJ IDEA complaints 2017-05-05 22:27:58 +01:00