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

https-dns-proxy: improve CLI messaging

Browse source 
Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
Stan Grishin 2023-07-23 05:22:04 +00:00
parent efdbac38dc
commit 649fbcf9fc
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/https-dns-proxy/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=https-dns-proxy PKG_NAME:=https-dns-proxy
PKG_VERSION:=2023-05-25 PKG_VERSION:=2023-05-25
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/ PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/

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

@ -67,7 +67,7 @@ uci_changes() {
/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} changes "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}" /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} changes "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}"
} }
dnsmasq_restart() { [ -x /etc/init.d/dnsmasq ] || return 0; /etc/init.d/dnsmasq restart >/dev/null 2>&1; } dnsmasq_restart() { [ -x /etc/init.d/dnsmasq ] || return 1; /etc/init.d/dnsmasq restart >/dev/null 2>&1; }
version() { echo "$PKG_VERSION"; } version() { echo "$PKG_VERSION"; }
@ -223,7 +223,7 @@ start_service() {
local procd_fw_src_interfaces local procd_fw_src_interfaces
local port=5053 local port=5053
output "Starting $serviceName " output "Starting $serviceName instances "
config_load "$packageName" config_load "$packageName"
config_get_bool canary_domains_icloud 'config' 'canary_domains_icloud' '1' config_get_bool canary_domains_icloud 'config' 'canary_domains_icloud' '1'
config_get_bool canary_domains_mozilla 'config' 'canary_domains_mozilla' '1' config_get_bool canary_domains_mozilla 'config' 'canary_domains_mozilla' '1'
@ -240,11 +240,21 @@ start_service() {
dhcp_backup 'create' dhcp_backup 'create'
config_load "$packageName" config_load "$packageName"
config_foreach start_instance "$packageName" config_foreach start_instance "$packageName"
if [ -n "$(uci_changes dhcp)" ]; then
uci_commit 'dhcp'
dnsmasq_restart
fi
output "\\n" output "\\n"
if [ -n "$(uci_changes dhcp)" ]; then
output "Updating dnsmasq config "
if uci_commit 'dhcp'; then
output_okn
else
output_failn
fi
output "Restarting dnsmasq "
if dnsmasq_restart; then
output_okn
else
output_failn
fi
fi
} }
stop_service() { stop_service() {