ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-10 23:12:48 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

dnsmasq: allocate a common config directory and instance specific one

Browse Source 
This PR simplifies a common folder between all dnsmasq instances (via a
single `--conf-dir`), so common config elements can be applied across
all instances. Each instance still gets its own folder wherein the init
script parses each file in its instance folder for inclusion via
`--conf-file`. `--conf-file` can be used multiple times (giving the
effect of another `--conf-dir`, which can only be used once).

The glob masks for specifying config files in instance folders are also
handled. It also quotes some variables which potentially contain spaces.

To reconcile this instance specific config folder at runtime:

 ubus call service list "{ 'name': 'dnsmasq' }" | jsonfilter -q -e "@['dnsmasq'].instances"

and further filter for '.d' entries in the mount array

Tested on 24.snapshot
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
This commit is contained in:
Paul Donald 2024-11-08 14:41:05 +01:00
parent 9c3f624d8e
commit 832584933e
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -11,8 +11,8 @@ ADD_LOCAL_HOSTNAME=1
ADD_WAN_FQDN=0
ADD_LOCAL_FQDN=""
COMMONCONFDIR="/tmp/dnsmasq.d"
BASECONFIGFILE="/var/etc/dnsmasq.conf"
EXTRACONFFILE="extraconfig.conf"
BASEHOSTFILE="/tmp/hosts/dhcp"
TRUSTANCHORSFILE="/usr/share/dnsmasq/trust-anchors.conf"
TIMEVALIDFILE="/var/state/dnsmasqsec"
@ -1144,21 +1144,42 @@ dnsmasq_start()
xappend "--dhcp-broadcast=tag:needs-broadcast"
# Set up daemon config paths
[ ! -d "$COMMONCONFDIR" ] && mkdir -p "$COMMONCONFDIR"
# Add common/shared --conf-dir (it can be used only once)
# ,* signals dnsmasq to glob every file in the path
xappend "--conf-dir=$COMMONCONFDIR,*"
# Per-instance configuration directory
config_get _instanceconfdir "$cfg" confdir "/tmp/dnsmasq${cfg:+.$cfg}.d,*"
# in case mask suffix was also provided
[ "$_instanceconfdir" != "${_instanceconfdir%%,*}" ] && {
_mask="${_instanceconfdir##*,}"
_instanceconfdir="${_instanceconfdir%%,*}"
}
# Set default file mask to *
_mask="${_mask:-*}"
# Ensure _instanceconfdir is an absolute path
[ "${_instanceconfdir:0:1}" = '/' ] && {
[ ! -d "$_instanceconfdir" ] && mkdir -p "$_instanceconfdir"
# Create a dnsmasq.d dir for each instance
config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq${cfg:+.$cfg}.d"
# Ensure dnsmasqconfdir is an absolute path
[ "${dnsmasqconfdir:0:1}" = '/' ] && {
xappend "--conf-dir=$dnsmasqconfdir"
dnsmasqconfdir="${dnsmasqconfdir%%,*}"
[ ! -d "$dnsmasqconfdir" ] && mkdir -p "$dnsmasqconfdir"
xappend "--user=dnsmasq"
xappend "--group=dnsmasq"
echo >> "$CONFIGFILE_TMP"
# EXTRACONFFILE allows new dnsmasq parameters before they are natively handled in this init file
# Instance-specific conf file
instance_conf_file="$_instanceconfdir/${cfg}.conf"
config_get extraconftext "$cfg" extraconftext
[ -n "$extraconftext" ] && echo -e "$extraconftext" > "$dnsmasqconfdir"/"$EXTRACONFFILE"
[ -n "$extraconftext" ] && echo -e "$extraconftext" > "$instance_conf_file"
# Add each instance path file individually (later, jail only the folder)
for conf in "$_instanceconfdir"/$_mask ; do
[ -f "$conf" ] || continue
xappend "--conf-file=$conf"
done
}
config_get_bool enable_tftp "$cfg" enable_tftp 0
@ -1254,7 +1275,8 @@ dnsmasq_start()
procd_add_jail dnsmasq ubus log
procd_add_jail_mount "$CONFIGFILE" "$DHCPBOGUSHOSTNAMEFILE" "$DHCPSCRIPT" "$DHCPSCRIPT_DEPENDS"
procd_add_jail_mount "$EXTRA_MOUNT" "$RFC6761FILE" "$TRUSTANCHORSFILE"
procd_add_jail_mount "$dnsmasqconffile" "$dnsmasqinstanceconfdir" "$resolvdir" "$user_dhcpscript"
procd_add_jail_mount "$COMMONCONFDIR"
procd_add_jail_mount "$dnsmasqconffile" "$_instanceconfdir" "$resolvdir" "$user_dhcpscript"
procd_add_jail_mount /etc/passwd /etc/group /etc/TZ /etc/hosts /etc/ethers
procd_add_jail_mount_rw /var/run/dnsmasq/ "$leasefile"
case "$logfacility" in */*)