Mcat12
f8d4c36f6d
Add back --wild list.sh help and use -- for long params like --regex
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
bcambl
fa9ecbdb81
add php-json to Fedora web deps
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
2bf6b29b8f
trigger an install/upgrade of PHP after enabling the Remi repository
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Dan Schaper
25812f88f6
Merge pull request #2262 from bcambl/additional_tests
...
additonal test coverage for installer
6 years ago
Dan Schaper
037989b8e4
Merge pull request #2271 from pi-hole/feature/installer_spacing
...
Start changes to new code style for repository. Revise basic installer.sh spacing.
6 years ago
Dan Schaper
dbc82cfb6a
Merge pull request #2236 from pi-hole/new/regex-lists
...
Use regex lists instead of wildcards for blocking
6 years ago
Mcat12
941a766aa3
Replace -wild and -regex with --wild and --regex
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
72be7ad5f0
Don't count commented out regex lines
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
b2a36f71a0
Fix wildcard description in pihole man page
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Adam Hill
6b17620389
Update .travis.yml
6 years ago
Adam Hill
b04195041a
Update README.md
6 years ago
Adam Hill
8ca4c66e3c
make smarter assertions rathe than `largestring not in string`
...
Signed-off-by: Adam Hill <adam@diginc.us>
6 years ago
Adam Hill
449b7bf6e4
reduce the amount of strict `not in` checks
...
Signed-off-by: Adam Hill <adam@diginc.us>
6 years ago
Adam Hill
88e4b6390c
Tox!
...
Signed-off-by: Adam Hill <adam@diginc.us>
6 years ago
Dan Schaper
de92bd1884
Merge pull request #2268 from pi-hole/fix/add-back-conditional-forwarding
...
Add back conditional forwarding to webpage.sh
6 years ago
Mcat12
1b276a74fe
Display all lines of a list, even if there is no newline at the end
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
bcambl
fff31558a0
assert REMI repository is not installed for Fedora
...
- fix whiptail mock comments to clarify continue vs cancel
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Mcat12
8084c4b2a3
Fix regex period substitution due to switching to bashism
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
1ca852191f
Fix stickler complaints
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
af5fc6547a
Fix echoing wrong domain when converting wildcard
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
70f2b26c86
Escape periods in wildcard converted regex filters.
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
cfd95dbe87
Fix incorrect variable usage
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
c5bb404d6a
Emulate wildcard blacklisting via -wild and move regex to -regex
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
bcambl
4c23964964
ensure images are build prior to running tests
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
e4a6dcd35c
update travis.yml to run tests in parallel
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
d4addd53ad
Add tests for Fedora/CentOS distro_check
...
- test to ensure installer behavior with unsupported CentOS releases
- test to ensure repository enablement
- test to ensure PHP upgrade opt-in/opt-out behavior
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Mcat12
d21298c156
Add back conditional forwarding to webpage.sh
...
This was accidentally removed in a previous PR.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Dan Schaper
9dba9fb366
Convert multiline echos to individual echo statements so they don't lead with different amounts of space.
...
Signed-off-by: Dan Schaper <dan.schaper@pihole.net>
6 years ago
bcambl
09d40679c0
add test for unsupported distro checking
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Dan Schaper
a323b126e5
Finished space conversion
...
Signed-off-by: Dan Schaper <dan.schaper@pihole.net>
6 years ago
bcambl
553aad6ed2
add Fedora container to test matrix
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
5ca2ad6148
move test globals & mock commands to conftest
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
40537e1522
python linting: missing whitespace after ',' (E231)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
064a75b21b
python linting: missing whitespace around operator (E225)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
1d3445bc0f
python linting: whitespace after '(' and before ')' (E201 & E202)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
79232d02c9
python linting: 'pytest' imported but unused (F401)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
9bd4986781
python linting: whitespace before ':' (E203)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
c3d443aaff
python linting: lines > 79 characters (E501)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
WaLLy3K
b087888f94
Merge pull request #2261 from pi-hole/fix-no-protocol
...
Treat adlists URLs without a protocol as HTTP
6 years ago
bcambl
da3dfd0998
python linting: missing whitespace after ':' (E231)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
4468d81472
python linting: 2 lines prior to defs (E302)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
WaLLy3K
7ddae8f2eb
Treat URLs without a protocol as HTTP
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
6 years ago
Mark Drobnak
6b2851a671
Merge pull request #2257 from pi-hole/fix/query-process-wildcards
...
Move processWildcards to query.sh
6 years ago
Mcat12
4763969c8f
Move processWildcards to query.sh
...
Closes #2255
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
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
Mcat12
61f0cbe10a
Update pihole man page for regex
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
0f4968d75c
Merge remote-tracking branch 'origin/development' into new/regex-lists
6 years ago
Mcat12
3077c22e4f
Change help strings from wildcard to regex blacklist
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
0decc37b5a
Appease stickler
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago