WaLLy3K
b9f2ba0717
Wording changes and bug fix
7 years ago
Adam Warner
bc8a5916d8
fix merge conflicts
7 years ago
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
7 years ago
WaLLy3K
39b74ebfd4
Show help for "pihole checkout --help"
7 years ago
WaLLy3K
4eb7d2868c
Fix "pihole disable --help" and "pihole -l --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
DL6ER
7abf349730
Use `echo "ABC" | pihole tricorder` to upload to Pi-hole's medical tricorder. Uses SSL if available.
7 years ago
WaLLy3K
c35c7b2cea
Wrap in double brackets
7 years ago
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.
7 years ago
WaLLy3K
3081c151bd
Perform EXACT searches on HOSTS lists correctly
...
`\s` on the end may be overkill, but it is the existing scanList() behaviour.
7 years ago
WaLLy3K
a0603ad3b7
Update queryFunc()
...
* Allow scanList() to search files using a wildcard by removing quotes wrapped around `${list}`
* scanList() will not provide a domain ouput on each string if exact is specified (`grep -l`)
* Remove unused processWildcards() function
* Return a message if no domain is specified
* IDN domains are converted to punycode when running a `pihole -q` search if the `python` package is available, otherwise will revert to current behaviour
* Scan Blacklist & Wildcards first, exiting from search if a match is found (Fixes #1330 )
* Use one `grep` subshell to search for all "*.domains" lists at once (opposed to looping to get every matching file name, and then spawning a `grep` instance for every matching file)
* queryFunc() will not return "(0 results)" output from files where no match is found
* Sort results based off list number
* Return a message if no results are found
8 years ago
Anthony Giorgio
fd584dd03b
Formatting cleanup.
...
Convert backticks to quotes to fix error message.
Make Pi-hole capitalization consistent.
Make Pi-hole capitalization consistent.
8 years ago
Mcat12
c4b43f92ce
Fix help text bug
...
Fixes #1325
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
DL6ER
8a14a63d5d
Pi-hole checkout feature
8 years ago
DL6ER
dce3e50a00
Check for existence of wildcard blocking list before trying to acces it
8 years ago
Dan Schaper
17b0db6515
Fix for calling -w without -a.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
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
38961fb31b
Help text clarification and addition of the automated debuggin flag.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
ba5bbf3523
Modify `pihole` for `-d -a` arguments.
8 years ago
Jacob Salmela
7a1a2dec67
update license to EUPL on core files
8 years ago
Markus Napp
19e30b829a
Add wildcard description to help text, improve other help texts
8 years ago
Jacob Salmela
51acdfa633
remove pihole -s flag
8 years ago
DL6ER
2935275227
Merge branch 'development' into wildcardblacklisting
8 years ago
Adam Warner
12bec1df68
Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
...
Major simplification of webpage.sh + extend DHCP to IPv6
8 years ago
DL6ER
2b778695b1
Implement querying ad lists support for wildcards (what hell of a bash experience)
8 years ago
DL6ER
40798da6b1
Add blacklisting wildcard support
8 years ago
DL6ER
d0cd39a25f
Added space behind :53 to only match port 53
8 years ago
DL6ER
1e627c7e8f
Make webpage.sh fully library style
8 years ago
DL6ER
9170488b0a
Test if DNS service is listening on local port 53
8 years ago
DL6ER
c674a175ee
Make grep case insensitive
8 years ago
Promofaux
906a1753be
specifically comment out gravity.list addn-host
8 years ago
Adam Warner
bebb569c43
Merge pull request #964 from pi-hole/queryadsonlyexactmatches
...
pihole -q: Add option to show all partial or only exact matches
8 years ago
Mcat12
74e33bb1a0
Merge pull request #973 from pi-hole/taillog
...
Add tail argument to automatically "tail -f" pihole.log
8 years ago
Mcat12
b591df55b0
Tell user how to exit tail command
8 years ago
Mcat12
b9e0e88fe9
Update pihole
8 years ago
DL6ER
5120d9ec33
Add tail option
8 years ago
DL6ER
c0886cb5c6
pihole -q <domain> is partial matching (as before), pihole -q <domain> -exact is exact matching (new behavior)
8 years ago
DL6ER
294df8690c
Do only one grep on each of the lists and count the number of non-empty lines in the result. Improves speed by factor of 2x
8 years ago
DL6ER
fb72ac9904
Show only exact matches for pihole -q
8 years ago
DL6ER
74cb79252c
Only looking for blocking entries (do not scan whitelist.txt)
8 years ago
DL6ER
6cd3c93472
Also query white- and blacklist
8 years ago
DL6ER
eb63e75379
No need for pipe here
8 years ago
Dan Schaper
2ec4acfe52
Begin fixing exit values.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Mcat12
3ba7d7640f
Merge pull request #933 from DL6ER/delayedreactivation
...
Add possiblity for delayed reactivation of blocking
8 years ago
DL6ER
7bf0985a57
Extended help text of main pihole command
8 years ago
DL6ER
f50cbe74cb
Changed -web (webpage) to -a (admin)
8 years ago
DL6ER
291ca0874a
Fixed two more typos
8 years ago
DL6ER
96f2aa1803
fixed typo
8 years ago
DL6ER
c6857501aa
Removed check for availability of nohup
8 years ago
DL6ER
3aba1607b2
Removed debug echos
8 years ago
DL6ER
f667298b64
Added possiblity for delayed reactivation of blocking
8 years ago
DL6ER
db278d81e4
Added webpage.sh
8 years ago
Dan Schaper
1d64ad1ccd
Stash all changed files, clean directory and pull updates.
8 years ago
Dan Schaper
dfb4ac0365
Keep .yml's from going to user local repos.
8 years ago
Dan Schaper
0ef8832b04
whitespace
8 years ago
Dan Schaper
e42a037b7d
Grep -i instead of cat.
8 years ago
Dan Schaper
fe18d69b65
Grep should start at the beginning of line to make sure it doesn't fire on `#` beginning lines.
8 years ago
Adam Warner
f36e4ba336
Cherry picking 3f049fa79
, conflict fix
8 years ago
Adam Warner
c47c5e466f
consistency
8 years ago
Promofaux
1d21b0da9a
enable or disable logging from pihole command
8 years ago
Adam Warner
469ff45f01
create list.sh. Combines whitelist and blacklist scripts in an effort to reduce code duplication.
...
update pihole script to reflect new white/blacklist command.
8 years ago
Promofaux
8ee98f0a4a
remove a space
8 years ago
Promofaux
82e78fb651
Add output to `pihole disable` and `pihole enable`
8 years ago
Promofaux
d0826b2c33
Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
8 years ago
Marcus Hildum
640398ced4
Consistency
...
We went with tabs earlier, may as well make that the "standard".
Easy enough to switch to spaces too if that's desired with expand(1)
8 years ago
Marcus Hildum
5ebfa5ecf7
heredoc for helpfunc in pihole
8 years ago
tuplink
e199f6db87
spelling updates
8 years ago
tuplink
c83dd3ccd7
change spacing
8 years ago
tuplink
78fbafa1cd
test out new status logic
8 years ago
Tommy Huff
685b775b68
rework status if statments
8 years ago
Tommy Huff
9056a5a7b6
fix spelling / replace tabs with spaces in help
8 years ago
Tommy Huff
3ca3eaa62c
change restartdnsmasq to restartdns
8 years ago
Tommy Huff
aaee895b2b
add pihole status web option to return 1 or 0 for easy use with php
8 years ago
Tommy Huff
7d7e17b351
add toggle to enable or disable pi-hole
8 years ago
Adam Warner
b66f23cfd0
account for new update script
8 years ago
Adam Warner
ce46c4dec4
remove prematurely added code
8 years ago
Adam Warner
77e8be09a1
handle passing arguments to version script
8 years ago
Adam Warner
29ad2496b6
don't output "elevating with sudo" in pihole script, just do it.
8 years ago
Promofaux
a43577fa26
add reconfigure flag to -r command
8 years ago
Promofaux
090fbd04af
Remove ${SUDO} usages and root checks from scripts called by `pihole` command as they should not be called directly.
8 years ago
Promofaux
461de48625
function declarations as per basic-install.sh
8 years ago
Promofaux
9352ba6e4a
about time we exit 0'd
8 years ago
Promofaux
5e883239f9
remove calls for ${SUDO} as per basic-install.sh.
8 years ago
Promofaux
5ea08a2120
add -r to reconfigure pihole (basically runs basic-install.sh from /etc/.pihole)
8 years ago
Promofaux
1a83988e26
Add check at the beginning of update script to check for existence of local repos. If not, redirect user to run install command again.
8 years ago
Promofaux
ec0c68621c
add blank line after Current version display
8 years ago
Promofaux
d58f7c6ec9
Remove references to dashboard update Script
8 years ago
Promofaux
d124c2c12e
Expand to check web admin versions
8 years ago
Promofaux
0229f70761
Make updatePiholeFunc a bit smarter. Only run update if version is not the latest.
8 years ago
Promofaux
dde9281139
Only pull master branch, the rest aren't needed!
8 years ago
Promofaux
4ec01769cb
Appease Jacob.
8 years ago
Promofaux
19b656132d
Make the output of pihole -q a bit clearer. Bye Bye nifty one-liner!
8 years ago
Promofaux
01a9534729
Merge branch 'development' into UpdateMethod
...
# Conflicts:
# automated install/basic-install.sh
8 years ago
Promofaux
d938f73207
Fix line endings
8 years ago
Promofaux
344e63c2dc
Add undocumented argument to install script ("pihole") which allows the pihole command to run the update script without prompting the user. Useful for update automation
8 years ago
Promofaux
681144b2a3
Change the switched for updateDashboard and updatePihole(was updateMain)
8 years ago
Adam Warner
77135ca3c7
Actually pass through the argument to the function
8 years ago
Adam Warner
29b548f07c
Add queryfunc
8 years ago
Dan Schaper
af666e2209
Escape space in updateMainFunc
...
Legacy space in path strikes again!
8 years ago
Promofaux
2f2e746e56
Add update function to pihole script
8 years ago
Promofaux
c0430a2248
It wouldn't be me if there weren't loads of commits for simple mistakes.
8 years ago
Promofaux
6796b8bdad
pass argument from pihole command to gravity for -f check
8 years ago
Promofaux
2bc364023a
Remove erroneous space in chmod command
...
Fix spacing in help function
8 years ago
Promofaux
6a17a3eeec
Add command to pihole script
8 years ago
bcambl
27a9642090
check for sudo via 'command -v' instead of dkpg-query
8 years ago
Promofaux
b6e1b3bff0
Last one, promise! tabs are behaving strangely here...
9 years ago
Promofaux
1ce888e828
more whitespace fixes......
9 years ago
Promofaux
1c10a801dc
Fix whitespace...
9 years ago
Promofaux
48fa83c9ac
Fix whitespace
9 years ago
Promofaux
05e0003555
Fixes issue #453
9 years ago
Adam Warner
0b480c2d3f
remove redundant else, add ! to if logic.
9 years ago
Adam Warner
96f3f863e5
Clean up output. Commented out un-needed root/sudo notification
9 years ago
Adam Warner
3877f6fd94
Fix arguments not being passed through to chronometer.sh
9 years ago
Promofaux
5976b20aec
Fix spelling mistake, remove unaccessed function.
9 years ago
nate
1a2046a7eb
Added uninstall option to `pihole` command. Minor fixes
9 years ago
nate
d47fbbbe96
Mcat12 requests. Added bash-completion support
9 years ago