Mark Drobnak
f9b75e486c
Merge pull request #2256 from pi-hole/fix/query-lists-variable-substitution
...
Fix incorrect variable string substitution
6 years ago
Mcat12
f868052062
Fix incorrect variable string substitution
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Dan Schaper
0ddfa8ad10
Merge pull request #2254 from andrewjanke/patch-1
...
typo fix
6 years ago
Andrew Janke
b74fb3f179
typo fix
6 years ago
Dan Schaper
2abaa60c2e
Merge pull request #2249 from pi-hole/revert-2069-fix/nullbyte
...
Revert "Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input"
6 years ago
Dan Schaper
d5547f5c7c
Revert "Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input"
6 years ago
Mark Drobnak
061510098c
Merge pull request #2246 from pi-hole/fix/debug-simple-gravity-list
...
Update debug script for simple list format
6 years ago
Mark Drobnak
4fc3546887
Merge pull request #2069 from pi-hole/fix/nullbyte
...
Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input
6 years ago
Mcat12
868948509a
Split declaration and assignment of random_url
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mark Drobnak
e71492a2b3
Update debug script for simple list format
...
Gravity is now just a list of domains, not IP addresses and domains separated by a space.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mark Drobnak
c2055f3514
Merge pull request #2240 from pi-hole/tweak/warn_on_tail_if_log_disabled
...
pihole -t: Warn user if Pi-hole's logging is disabled
6 years ago
DL6ER
a7c73036f0
pihole -t: Warn user if Pi-hole's logging is disabled
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Mark Drobnak
e80d27f273
Merge pull request #2234 from rrobgill/split-query-functions
...
Fix grep query leak & relocate query
6 years ago
Rob Gill
23adbf9540
remove quotes
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
a7347238e6
$adListsList replace filename in text
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
bf55666492
Appease stickler.
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
8ab0b0e460
colfile
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
b8e1849cec
wildcardlist
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
2255d05664
Remove scanlist(), now in query.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
45a8eda49b
Stop grep leak in query
...
Fix grep error leak from #1805
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
b1207949ac
Call query.sh to replace queryFunc()
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
d61fd01d61
Split queryFunc() into query.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Mark Drobnak
4d5d3108fb
Merge pull request #2231 from alexvy86/patch-1
...
Remove error text from message when next whitelist request succeeds
6 years ago
Alex Villarreal
e422f4154f
Clean error message on successful response
...
Signed-off-by: Alejandro Villarreal <alex@alexvy86.com>
6 years ago
Mark Drobnak
0651f1bcd4
Merge pull request #2220 from rrobgill/installedphpcheck
...
Bugfix - Check version of installed php
6 years ago
Rob Gill
11f0ade921
comments
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Mark Drobnak
5cab2e1c43
Merge pull request #2224 from rrobgill/bashcompletion
...
Bashcompletion
6 years ago
Rob Gill
6381bdbf33
don't use major.minor for PHP 5
...
Signed-off-by: <rrobgill@protonmail.com>
6 years ago
Mark Drobnak
c8bcd4af2d
Merge pull request #2004 from pi-hole/tweak/32bitOS_on_64bitCPU
...
Install 32bit FTL on 32bit OS (even if 64bit architecture is detected)
6 years ago
Rob Gill
cabb06230c
--json not --jason
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Mcat12
4a75566a3b
Merge remote-tracking branch 'origin/development' into tweak/32bitOS_on_64bitCPU
6 years ago
Mark Drobnak
d9c924b472
Merge pull request #2225 from rrobgill/ftlinstall-local-vars
...
remove duplicate declaration in ftlinstall()
6 years ago
Rob Gill
52aa52c3b1
remove duplicate declaration
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
8004080643
Additional command-line completion
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
13878974a6
Merge pull request #4 from pi-hole/development
...
Development
6 years ago
Mark Drobnak
6689e00e6a
Merge pull request #2212 from rrobgill/man-pages
...
Man page for pilhole-FTL
6 years ago
Mark Drobnak
9b8a108f86
Merge pull request #2221 from pi-hole/tweak/statsnologs
...
Stats can still be generated without logging, no need for this sentence
6 years ago
Rob Gill
a3569d88c9
Version strings & bash.
...
Fixed up the version checking. Thanks for your help @dschaper.
No longer uses the version string as returned, but uses the major and minor version numbers extracted from it, against the minimum of 5.5.
Tested against real install of php 7.0, (and the version check logic separately tested against a variety of artificial version numbers, of multiple digits for both major and minor version. - Lesson learned, I'm never trusting bash again)
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Adam Warner
f2f6b6ede9
stickler complaints
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
7f81cfd45a
Stats can still be generated without logging, no need for this sentence
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Rob Gill
13b8e1a2ae
quotes.
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
36dbdf955d
Update basic-install.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
714b6c98ef
codacy
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
7181d7ae6a
Left that fi
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
9422d57283
Check version of installed php
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Jacob Salmela
5724cec1e5
Merge pull request #2219 from pi-hole/tweak/readme
...
Add coverage, remove projects, add Patreon link
6 years ago
Jacob Salmela
35ca54d98f
add patreon and adjust affiliate links
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
6 years ago
Jacob Salmela
7398a9ebf9
remove projects that are not compliant with our trademarks
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
6 years ago
Rob Gill
4188fb536e
Privacy levels
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
a11e5e2deb
dnsmasq
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago