WaLLy3K
7453bf2ee6
Fix wildcard help text
...
* -wild is not a valid option since we're already using -wild
7 years ago
WaLLy3K
7d17c652f3
Merge branch 'development' into development
7 years ago
Adam Warner
90119c75d5
more merge conflicts!
7 years ago
WaLLy3K
30035ce1c2
Merge branch 'development' into tweak/help-output
7 years ago
WaLLy3K
3bd677c102
Show help for "pihole -v -h"
...
* Indent output text
* Minor help text change
7 years ago
WaLLy3K
0e4473685b
Show help for "pihole -a -i --help"
7 years ago
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
7 years ago
Dan Schaper
25601b9fcc
Document `sed` substitution for user readability
...
Comment the oneliner with explanations of what each step does.
7 years ago
Adam Hill
55f78e3b64
Update list.sh
...
I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)
7 years ago
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.
7 years ago
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.
7 years ago
Dan Schaper
5bb91759b4
Merge pull request #1459 from WaLLy3K/patch-2
...
Provide remote hashes for version.sh
7 years ago
Dan Schaper
80c4b7c9bb
Merge pull request #1455 from pi-hole/tweak/logecho_gateway
...
Debug: Log and echo gateway responses
7 years ago
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
7 years ago
Dan Schaper
501b26decd
Log and echo gateway responses
7 years ago
WaLLy3K
c6596f2c54
Modified syntax to be valid for Shellcheck
7 years ago
WaLLy3K
2863308090
Minimise string duplication & other minor changes
...
Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().
8 years ago
WaLLy3K
7fef1fdc83
Fixed indentation
8 years ago
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
8 years ago
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!
```
8 years ago
Adam Warner
9beb9fd941
Merge pull request #1384 from pi-hole/checkoutImprovements
...
Stash changes when switching branches
8 years ago
DL6ER
9cc392fa02
Update Marks PR after the Promo code has been merged
8 years ago
Adam Warner
9c136a5579
functionise Hashing
8 years ago
DL6ER
30dcf6ff47
Include pihole-FTL.log in debug report
8 years ago
DL6ER
19e688effb
Add localise-queries flag to 01-pihole.conf
8 years ago
Dan Schaper
bfc4775b34
Merge pull request #1297 from raincoats/development
...
Redirect to admin panel when accessing 'http://pi.hole/ '
8 years ago
DL6ER
db1e5f10ea
Make changes according to comment in #1384
8 years ago
DL6ER
f1f70133dc
Populate $ipv4 and $ipv6 + fix small error that prevented blocking page from coming up at all. Fixes #1396
8 years ago
DL6ER
320c06e0a4
Flush twice to move data out-of-sight of FTL
8 years ago
Adam Warner
2e398c5da4
stash changes on branch switch, else it fails if any changes have been made.
8 years ago
DL6ER
fcd92d27f7
Don't use PID file but rather "pidof pihole-FTL" for detecting if another process is already running
8 years ago
DL6ER
3eacfa9831
Improve FTL's service script
8 years ago
Mcat12
a96b4d28e1
Merge pull request #1365 from pi-hole/adlistImprovements
...
Adlist improvements
8 years ago
Mcat12
57e8b7f924
Merge pull request #1355 from pmo3/development
...
Mask password input when changing password
8 years ago
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
8 years ago
DL6ER
ad9575ce18
Recognize more host names
8 years ago
Adam Warner
3cf9942465
spacing fixed
8 years ago
Adam Warner
153031482f
Add delete mode to adlist command. Might be abetter way to do this
8 years ago
Adam Warner
af2cff5177
remove call to user list
8 years ago
Adam Warner
5435b93df2
remove spaces
8 years ago
Adam Warner
3a3dde6298
add adlist argument redirector
8 years ago
Adam Warner
b4bc90fb85
add in CustomizeAdlists function
8 years ago
DL6ER
f09c166350
Improve Error 404 page behavior
8 years ago
Patrick O'Brien
24868fdb2b
Merge remote-tracking branch 'upstream/development' into development
8 years ago
Patrick O'Brien
a463250ecf
don't hash an empty password
8 years ago
Flo
6eb9192cd1
Complete site
...
The start <html>-tag was missing.
8 years ago
Patrick O'Brien
94f15f1b3c
Merge remote-tracking branch 'upstream/development' into development
8 years ago
Patrick O'Brien
ee296f36c1
mask password input on command line
8 years ago
Mcat12
fb3e6ee35c
Source setupVars before attempting to use it
...
Fixes #1347
8 years ago
Dan Schaper
2740c68a63
Merge pull request #1335 from pi-hole/tweak/debug_templog
...
Debugging tweaks for temporary logfiles
8 years ago
Dan Schaper
b1f769b671
Output cleaning, IP stack check headers.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
77378da70a
Cat out temp files to final log.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
160030b75f
Quiet systemctl output to just the current daemon status.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
0a0c3a2fb7
Copy working temp to final location.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
e9f1ca338f
Create temp files for working storage, log to working storage temps.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Adam Warner
cfaf1ac67c
add check on file_parse to not include WEBPASSWORD= in the debug log
8 years ago
Adam Warner
6b862dd9e9
Only remove from wildcard list if domain is being added to whitelist or blacklist
8 years ago
Markus Napp
bb7a7d94ef
Replace misleading letter variable
8 years ago
Markus Napp
9a475cc010
Rewrite help text for better handling of params
8 years ago
Markus Napp
ae30c285a2
Fix handling of wildcard help text
8 years ago
Dan Schaper
2e74219ff9
Merge pull request #1313 from pi-hole/new/piholecheckout
...
Checkout adjustments
8 years ago
Dan Schaper
b0ae954f1e
Only update when `update` flag is set to "true"
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
DL6ER
38547ced7a
Can only diff once upstream branch is tracked
8 years ago
DL6ER
9a9d9007cd
Add missing "== true"
8 years ago
DL6ER
bd2d81f691
source setupVars.conf to see if INSTALL_WEB is true or not
8 years ago
DL6ER
1b9e7fbf2e
Test if branch is locally available is not reliable because of possible ambiguities
8 years ago
DL6ER
d4a49d192f
Correct variable name
8 years ago
DL6ER
8cb66544d2
Remove "\ "
8 years ago
DL6ER
140ac192aa
The web repo might actually be missing and this is n error (not installed because the user didn't want it)
8 years ago
DL6ER
b961b13d60
Small bugfix
8 years ago
DL6ER
febdb4a190
Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all)
8 years ago
DL6ER
1d60b62e7a
Testing alternative way of fetching/checking out of a single branch
8 years ago
Dan Schaper
41e1e4cb68
Rearrange pull logic, some optimization.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
d5b88e0df8
Get the right name for the options.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
20fd61468d
Require branch to check out
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
0a0d25dff4
Script runs in subshell, no need to cd back to pwd.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
raincoats
1590a179fa
Change 302 redirect to 301
...
Change "302 Found" response to "301 Moved Permanently", as "302 Found" is meant for temporary redirects.
Was asked to do so in this comment: https://github.com/pi-hole/pi-hole/pull/1297#issuecomment-284335421
8 years ago
DL6ER
2b3afbfef8
Merge pull request #1310 from pi-hole/new/piholecheckout
...
Pi-hole checkout feature
8 years ago
DL6ER
81a1057cac
Fix something Dan has overlooked
8 years ago
DL6ER
fd310c6445
Back to how we had it before, because --unshallow does not work at all
8 years ago
Dan Schaper
a9b52518bf
Shift numbers for argument identifiers, functions are called after `shift`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
87da40068c
Always `exit`ed with value 1, now exits with proper value.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
b8f1eadb7f
Shift off `checkout` from being passed to script from `pihole`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
b522d8eaf6
Source and reuse existing variables, centralize code.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
Dan Schaper
56e17d1010
Source functions and variables from basic-install.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
d2ab0694b7
Add "master" shortcut
8 years ago
DL6ER
8a14a63d5d
Pi-hole checkout feature
8 years ago
DL6ER
8235b18854
Remove duplicated line
8 years ago
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
8 years ago
DL6ER
10bc8414b9
Move FTL querying before clearing the terminal to avoid flashing on Pi B+
8 years ago
DL6ER
4e25e0dc5c
Add missing } to JSON output
8 years ago
DL6ER
b1a9793d94
Let Chronometer query all data from FTL (no need for having the API). Fixes #1305
8 years ago
DL6ER
6dea00668e
Don't try to obtain version of web interface it it is not installed. Fixes #1303
8 years ago
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
8 years ago
DL6ER
cf31561267
Remove wildcard entry when adding the very same domain either the white- or blacklist
8 years ago
DL6ER
a97f0b1298
Merge pull request #1300 from pi-hole/fix/deletehostrecord
...
Bugfix for when deleting host-record
8 years ago
Dan Schaper
d1e0f3ae18
Merge pull request #1294 from pi-hole/tweak/debugDNS
...
Tweak DNS debugging
8 years ago
DL6ER
47a6786e8f
Use proper test syntax
8 years ago
DL6ER
a69fcbb91e
Bugfix for when deleting host-record
8 years ago
Dan Schaper
8e2b51b391
Merge pull request #1296 from pi-hole/fix/debugVersion
...
Debug version detection improvements
8 years ago
Dan Schaper
560af43204
Merge pull request #1293 from pi-hole/fix/version
...
Account for hash in versioning
8 years ago
DL6ER
baefec86f2
Add CLI teleporter feature
8 years ago
raincoats
eb763d2dc2
Redirect to admin panel when accessing ' http://pi.hole/ '
...
If someone tries to access 'http://pi.hole/ ', it will take them to the "Website blocked" page. Very confusing if you don't know to go to 'http://pi.hole/admin/ '. This just redirects them to the admin panel.
8 years ago
Dan Schaper
512c650441
Shellchecking.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
dc44fc9e27
Version check amalgamation and removal of && || logic.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
6f2fb57c08
Protocol specific records checks.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
2547cc4c8d
Only run IPv6 if enabled, split out Chaos TXT checks.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
9f4ef66f41
Add IPv6 resolver test
8 years ago
DL6ER
086f0790fc
Add Google's IPv6 address for potential IPv6 resolver tests
8 years ago
Dan Schaper
709b44f736
IPv4 DNS tests
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
6cd4ff6d68
Organize functions and function calls.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
abd3e828de
Optimize normalOutput
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
b85af50d14
Generate only the information that is actually asked for
8 years ago
Dan Schaper
0e8fd49669
Function...
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
945e22874e
Collapse duplicate functions, and take out argument loops.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
77ab47a984
Awk for perl
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
Dan Schaper
8831b22fc8
Prototype function for getting version of local repo
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
0341bd1758
Optimize code, undoc flag for current hash.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
9bb4a5fb25
Factor out variables from display.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
Dan Schaper
81939ab265
Get short hash of local and remote
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
f2fe84c9d3
Merge pull request #1292 from pi-hole/master
...
Merge patches back into devel
8 years ago
DL6ER
f626406685
Revert #1273
8 years ago
DL6ER
dd971b6ee5
Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)
8 years ago
DL6ER
f1b8abf503
Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked
...
[FTL] Show most recently blocked domain in chronometer
8 years ago
DL6ER
66b7d04b82
Merge branch 'development' into new/FTL-binary
8 years ago
DL6ER
7ba47f504c
Add special "except-interface" line in case of listening on all interfaces
8 years ago
DL6ER
0be1717ff4
Fix config error
8 years ago
DL6ER
189a4e0078
Add option to skip restarting of dnsmasq
8 years ago
DL6ER
3adf8785d8
Move "all" down in help text to not suggest that it is the default
8 years ago
DL6ER
b74862bfc5
Actually apply new setting by restarting dnsmasq
8 years ago
DL6ER
01273124ea
Change to -i, interface
8 years ago
DL6ER
721ada7e16
Fix typo
8 years ago
DL6ER
bd9dc91396
Add response for users manually setting this up via CLI
8 years ago
DL6ER
de6c43a8d3
Setup interface listening behavior of dnsmasq
8 years ago
Dan Schaper
f6fc6a5e56
Merge pull request #1281 from pi-hole/tweak/web_debug
...
Back end changes for Web based debug calls.
8 years ago
Dan Schaper
83b0600863
Carriage return or newline based webcalls.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
6c130b7960
Vebiage and highligh the token, also `:::`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
7244d44a1d
Notify user that log is being uploaded.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
9b060aab34
Debug auto mode engaged
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
ec7e75a6e3
Don't save `interface=` line to `dnsmasq`s config file
8 years ago
DL6ER
ce6c465942
Merge pull request #1266 from pi-hole/new/host-record
...
Add host-record option
8 years ago
Jacob Salmela
7a1a2dec67
update license to EUPL on core files
8 years ago
DL6ER
7ed1bbad49
Add host-record option
8 years ago
DL6ER
078cc7660e
Improved updater logic
8 years ago
DL6ER
af2893d2ce
Updater implementation for FTL
8 years ago
ProtoFoo
fb6631d317
Removed a line that did nothing.
8 years ago