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

fix merge conflicts

This commit is contained in:
Adam Warner 2017-05-14 16:17:04 +01:00
parent 30035ce1c2 f202602f99
commit bc8a5916d8
No known key found for this signature in database
GPG Key ID: 7C062498C7FA6E49
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pullapprove.yml
View File

@ -10,7 +10,7 @@ group_defaults:
reset_on_push: reset_on_push:
enabled: true enabled: true
reject_value: -2 reject_value: -2
approve_regex: '^(Approved|:shipit:|:\+1:|Engage)' approve_regex: '^(Approved|:shipit:|:\+1:|Engage|:taco:)'
reject_regex: '^(Rejected|:-1:|Borg)' reject_regex: '^(Rejected|:-1:|Borg)'
author_approval: author_approval:
auto: true auto: true

14
pihole
View File

@ -94,7 +94,7 @@ scanList() {
queryFunc() { queryFunc() {
method="${3}" method="${3}"
# If domain contains non ASCII characters, convert domain to punycode if python exists # If domain contains non ASCII characters, convert domain to punycode if python exists
# Cr: https://serverfault.com/a/335079 # Cr: https://serverfault.com/a/335079
if [[ -z "${2}" ]]; then if [[ -z "${2}" ]]; then
@ -105,7 +105,7 @@ queryFunc() {
else else
domain="${2}" domain="${2}"
fi fi
# Scan Whitelist, Blacklist and Wildcards # Scan Whitelist, Blacklist and Wildcards
lists="/etc/pihole/whitelist.txt /etc/pihole/blacklist.txt $wildcardlist" lists="/etc/pihole/whitelist.txt /etc/pihole/blacklist.txt $wildcardlist"
result=$(scanList ${domain} "${lists}" ${method}) result=$(scanList ${domain} "${lists}" ${method})
@ -122,7 +122,7 @@ queryFunc() {
[ -n "$method" ] && exact="exact " [ -n "$method" ] && exact="exact "
echo "::: No ${exact}results found for ${domain}" echo "::: No ${exact}results found for ${domain}"
fi fi
exit 0 exit 0
} }
@ -288,7 +288,7 @@ Switch Pi-hole subsystems to a different Github branch
Repositories: Repositories:
core [branch] Change the branch of Pi-hole's core subsystem core [branch] Change the branch of Pi-hole's core subsystem
web [branch] Change the branch of Admin Console subsystem web [branch] Change the branch of Admin Console subsystem
Branches: Branches:
master Update subsystems to the latest stable release master Update subsystems to the latest stable release
dev Update subsystems to the latest development release" dev Update subsystems to the latest development release"
@ -304,7 +304,7 @@ helpFunc() {
echo "Usage: pihole [options] echo "Usage: pihole [options]
Example: 'pihole -w -h' Example: 'pihole -w -h'
Add '-h' after specific commands for more information on usage Add '-h' after specific commands for more information on usage
Whitelist/Blacklist Options: Whitelist/Blacklist Options:
-w, whitelist Whitelist domain(s) -w, whitelist Whitelist domain(s)
-b, blacklist Blacklist domain(s) -b, blacklist Blacklist domain(s)
@ -329,9 +329,9 @@ Options:
Add '-h' for more info on logging usage Add '-h' for more info on logging usage
-q, query Query the adlists for a specified domain -q, query Query the adlists for a specified domain
Add '-exact' AFTER a specified domain for exact match Add '-exact' AFTER a specified domain for exact match
-up, updatePihole Update Pi-hole subsystems -up, updatePihole Update Pi-hole subsystems
-v, version Show installed versions of Pi-hole, Admin Console & FTL -v, version Show installed versions of Pi-hole, Admin Console & FTL
Add '-h' for more info on version usage Add '-h' for more info on version usage
uninstall Uninstall Pi-hole from your system uninstall Uninstall Pi-hole from your system
status Display the running status of Pi-hole subsystems status Display the running status of Pi-hole subsystems
enable Enable Pi-hole subsystems enable Enable Pi-hole subsystems