tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,435 Commits 8 Branches 109 Tags 31 MiB
Commit Graph

2435 Commits

Author SHA1 Message Date
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 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
Adam Warner 41dd163453
further simplify 2017-05-05 22:27:33 +01:00
Adam Warner 5cd2c77d98
simplify 2017-05-05 22:24:40 +01:00
Adam Warner f270f7430c
Update block page. Allow for setupVars setting of CUSTOMBLOCKPAGE (bool) to prevent it being overwritten 2017-05-05 22:10:24 +01:00
Dan Schaper 99b23627d0 Update basic-install.sh 2017-05-05 12:03:51 -07:00
Adam Warner 26fcb1b2a0 Merge pull request #1429 from pi-hole/development 
Release v3.0.1
 2017-05-04 15:12:26 +01:00
DL6ER e9c4e8123c Merge branch 'master' into development 2017-05-04 12:12:44 +02:00
Dan Schaper a290e01bdf Merge pull request #1421 from pi-hole/fix/accidental-password-reset 
Add option to enter new password as command arg
 2017-05-04 03:11:54 -07:00
DL6ER 9cc392fa02
Update Marks PR after the Promo code has been merged 2017-05-04 11:43:48 +02:00
Dan Schaper 7c2046cce7 Merge pull request #1423 from pi-hole/promoLearnsToCode 
Double hash the password directly in the install script
 2017-05-03 12:07:38 -07:00
Adam Warner b13171cc45
$1 is not $pw. Seriously, who let me onto this project 2017-05-02 22:37:38 +01:00
Adam Warner 9c645e2010
Seriously. 2017-05-02 22:30:02 +01:00
Adam Warner bb6f409e89
dropped a " 2017-05-02 22:28:32 +01:00
Adam Warner 61ec7723f6
use function in install script 2017-05-02 22:25:47 +01:00
Adam Warner 9c136a5579
functionise Hashing 2017-05-02 22:24:37 +01:00
Adam Warner a5733508ae
Double hash the password directly in the install script 2017-05-02 21:36:08 +01:00
DL6ER c8e1e6dc8a Merge pull request #1418 from pi-hole/tweak/debug/FTL_log 
Include pihole-FTL.log in debug report
 2017-05-02 09:41:35 +02:00
DL6ER 30dcf6ff47
Include pihole-FTL.log in debug report 2017-05-02 09:18:58 +02:00
DL6ER 3473ebc0fe Merge pull request #1408 from pi-hole/tweak/localise-queries 
Add localise-queries flag to dnsmasq's config
 2017-05-02 08:56:47 +02:00
Dan Schaper 8c657910ae Merge pull request #1280 from technicalpyro/development 
fixes missing dialog package from some distros
 2017-05-01 16:07:32 -07:00
Dan Schaper 1886c44579 Merge pull request #1406 from pi-hole/update/UA 
Update default User Agent to modern browser.
 2017-05-01 14:35:55 -07:00
Adam Warner 1dcc1871fb Merge pull request #1404 from pi-hole/development 
3.0
 2017-05-01 22:03:54 +01:00
DL6ER 19e688effb
Add localise-queries flag to 01-pihole.conf 2017-04-30 13:47:07 +02:00
Dan Schaper 6a2b885988
Update default User Agent to modern browser. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-04-27 11:41:08 -07: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
Adam Warner 981004606b
Merge branch 'master' into development 2017-04-26 20:12:34 +01:00
Adam Warner 9d40fd1eda
Merge branch 'development' Resolved conflicts 
# Conflicts:
#	advanced/Scripts/piholeCheckout.sh
 2017-04-26 20:12:16 +01:00
DL6ER db1e5f10ea
Make changes according to comment in #1384 2017-04-21 17:08:15 +02:00
DL6ER fbb6b56d99 Merge pull request #1397 from pi-hole/fix/ipv4ipv6error 
Bugfix: Blocking page
 2017-04-20 16:18:50 +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 d0f55e5125 Merge pull request #1394 from pi-hole/fix/remove-temp-gravity-files 
Delete the temp files created by gravity
 2017-04-19 08:46:01 +02:00
Mcat12 5e308dbd51 Delete the temp files created by gravity 2017-04-18 20:35:06 -04:00
Mcat12 c3c554f4d6 Merge pull request #1391 from pi-hole/tweak/flush 
Flush twice to move data out-of-sight of FTL
 2017-04-17 20:10:03 -04: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 b1484104bd Merge pull request #1379 from pi-hole/tweak/FTLinit.d 
Tweaks for `FTL`'s init file
 2017-04-13 12:53:37 +02:00
Mcat12 c738a9a044 Merge pull request #1381 from technicalpyro/development 
Grammar Fix
 2017-04-12 21:29:39 -04:00
Technicalpyro 519cb71022 Grammar Fix 
]
 2017-04-12 16:05:21 -04: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