Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

https-dns-proxy: shellcheck & beautify

Browse source 
Signed-off-by: Stan Grishin <stangri@melmac.net>
This commit is contained in:
Stan Grishin 2020-03-13 02:36:58 +00:00 committed by Gerard Ryan
parent 3d9b512685
commit 5b03da037a
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/https-dns-proxy/files/README.md
View file

@ -88,7 +88,7 @@ The https-dns-proxy instance settings are:
|group|String|nogroup|Local group to run instance under.|
|use_http1|Boolean|0|If set to 1, use HTTP/1 on installations with broken/outdated ```curl``` package. Included for posterity reasons, you will most likely not ever need it on OpenWrt.|
|verbosity|Integer|0|logging verbosity level. fatal = 0, error = 1, warning = 2, info = 3, debug = 4|
|ipv6_resolvers_only|Boolean|0|If set to 1, Forces IPv6 DNS resolvers instead of IPv4|
|use_ipv6_resolvers_only|Boolean|0|If set to 1, Forces IPv6 DNS resolvers instead of IPv4|
## Thanks

14
net/https-dns-proxy/files/https-dns-proxy.init
View file

@ -48,12 +48,14 @@ start_instance() {
append_bool "$cfg" 'use_http1' '-x'
config_get verbosity "$cfg" 'verbosity' "0"
# shellcheck disable=SC2086,SC2154
for i in $(seq 1 $verbosity); do
xappend "-v"
done
config_get_bool ipv6_resolvers_only "$cfg" 'ipv6_resolvers_only' '0'
if [ "$ipv6_resolvers_only" == 0 ]; then
config_get_bool ipv6_resolvers_only "$cfg" 'use_ipv6_resolvers_only' '0'
# shellcheck disable=SC2154
if [ "$ipv6_resolvers_only" = 0 ]; then
xappend "-4"
fi
@ -123,8 +125,8 @@ dnsmasq_add_doh_server() {
;;
esac
uci -q del_list dhcp."$cfg".server="$address#$port"
uci -q add_list dhcp."$cfg".server="$address#$port"
uci -q del_list "dhcp.$cfg.server=${address}#${port}"
uci -q add_list "dhcp.$cfg.server=${address}#${port}"
}
dnsmasq_create_server_backup() {
@ -134,7 +136,7 @@ dnsmasq_create_server_backup() {
for i in $(uci -q get "dhcp.$cfg.server"); do
uci -q add_list dhcp."$cfg".doh_backup_server="$i"
if [ "$i" = "${i//127.0.0.1}" ] && [ "$i" = "$(echo "$i" | tr -d /)" ]; then
uci -q del_list dhcp."$cfg".server="$i"
uci -q del_list "dhcp.$cfg.server=$i"
fi
done
}
@ -145,7 +147,7 @@ dnsmasq_restore_server_backup() {
if uci -q get "dhcp.$cfg.doh_backup_server" >/dev/null; then
uci -q del "dhcp.$cfg.server"
for i in $(uci -q get "dhcp.$cfg.doh_backup_server"); do
uci -q add_list dhcp."$cfg".server="$i"
uci -q add_list "dhcp.$cfg.server=$i"
done
uci -q del "dhcp.$cfg.doh_backup_server"
fi