Commit Graph

708 Commits

Author SHA1 Message Date
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
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 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 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
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
Adam Warner 9beb9fd941 Merge pull request #1384 from pi-hole/checkoutImprovements
Stash changes when switching branches
2017-05-05 23:22:54 +01:00
DL6ER 9cc392fa02
Update Marks PR after the Promo code has been merged 2017-05-04 11:43:48 +02:00
Adam Warner 9c136a5579
functionise Hashing 2017-05-02 22:24:37 +01:00
DL6ER 30dcf6ff47
Include pihole-FTL.log in debug report 2017-05-02 09:18:58 +02:00
DL6ER 19e688effb
Add localise-queries flag to 01-pihole.conf 2017-04-30 13:47:07 +02:00
Dan Schaper bfc4775b34 Merge pull request #1297 from raincoats/development
Redirect to admin panel when accessing 'http://pi.hole/'
2017-04-26 12:35:19 -07:00
DL6ER db1e5f10ea
Make changes according to comment in #1384 2017-04-21 17:08:15 +02:00
DL6ER f1f70133dc
Populate $ipv4 and $ipv6 + fix small error that prevented blocking page from coming up at all. Fixes #1396 2017-04-20 13:53:27 +02:00
DL6ER 320c06e0a4
Flush twice to move data out-of-sight of FTL 2017-04-17 21:25:15 +02:00
Adam Warner 2e398c5da4
stash changes on branch switch, else it fails if any changes have been made. 2017-04-14 17:20:13 +01:00
DL6ER fcd92d27f7
Don't use PID file but rather "pidof pihole-FTL" for detecting if another process is already running 2017-04-12 15:12:09 +02:00
DL6ER 3eacfa9831
Improve FTL's service script 2017-04-12 14:13:18 +02:00
Mcat12 a96b4d28e1 Merge pull request #1365 from pi-hole/adlistImprovements
Adlist improvements
2017-04-06 16:15:50 -04:00
Mcat12 57e8b7f924 Merge pull request #1355 from pmo3/development
Mask password input when changing password
2017-04-03 20:23:19 -04:00
Flo 7e0aa822b6 Match the Pi-hole brand (#1358)
* Update README.md

* Update index.php

* Update basic-install.sh

* Update piholeCheckout.sh

* Update update.sh

* Update CONTRIBUTING.md

* Update the Pi-hole brand tip in CONTRIBUTING.md

Use a better formulation.

* Update README.md 2
2017-04-03 17:29:57 +02:00
DL6ER ad9575ce18
Recognize more host names 2017-04-03 16:28:18 +02:00
Adam Warner 3cf9942465
spacing fixed 2017-03-31 23:00:56 +01:00
Adam Warner 153031482f
Add delete mode to adlist command. Might be abetter way to do this 2017-03-31 22:51:10 +01:00
Adam Warner af2cff5177
remove call to user list 2017-03-31 20:13:04 +01:00
Adam Warner 5435b93df2
remove spaces 2017-03-31 20:05:45 +01:00
Adam Warner 3a3dde6298
add adlist argument redirector 2017-03-31 20:03:56 +01:00
Adam Warner b4bc90fb85
add in CustomizeAdlists function 2017-03-31 19:35:52 +01:00
DL6ER f09c166350
Improve Error 404 page behavior 2017-03-28 14:02:00 +02:00
Patrick O'Brien 24868fdb2b Merge remote-tracking branch 'upstream/development' into development 2017-03-27 13:38:19 -04:00
Patrick O'Brien a463250ecf don't hash an empty password 2017-03-27 13:37:19 -04:00
Flo 6eb9192cd1 Complete site
The start <html>-tag was missing.
2017-03-25 16:11:37 +01:00
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
Dan Schaper 2e74219ff9 Merge pull request #1313 from pi-hole/new/piholecheckout
Checkout adjustments
2017-03-11 13:01:11 -08:00