miniupnpd: rename UCI section name to settings (v2.0)

Inspired/address copilot's PR review for a clearer config by rename UCI
section name `config` (v1.0) -> `settings` (v2.0), helps on migration
and to distinguish the updated config from the previous one easily

(to merge with prior)

Signed-off-by: Self-Hosting-Group <[email protected]>

Author: Self-Hosting-Group

net/miniupnpd/files/firewall3.include

@@ -48,11 +48,11 @@ add_extzone_rules() {
 
 # By default, user configuration is king.
 
-for ext_iface in $(uci -q get upnpd.config.external_iface); do
+for ext_iface in $(uci -q get upnpd.settings.external_iface); do
     add_extzone_rules $(fw3 -q network "$ext_iface")
 done
 
-add_extzone_rules $(uci -q get upnpd.config.external_zone)
+add_extzone_rules $(uci -q get upnpd.settings.external_zone)
 
 [ "$ADDED" -ne 0 ] && exit 0
 

net/miniupnpd/files/miniupnpd.hotplug

@@ -10,9 +10,9 @@
 [ "$ACTION" != "ifup" ] && /etc/init.d/miniupnpd running && exit 0
 
 tmpconf="/var/etc/miniupnpd.conf"
-external_iface=$(uci -q get upnpd.config.external_iface)
-external_iface6=$(uci -q get upnpd.config.external_iface6)
-external_zone=$(uci -q get upnpd.config.external_zone)
+external_iface=$(uci -q get upnpd.settings.external_iface)
+external_iface6=$(uci -q get upnpd.settings.external_iface6)
+external_zone=$(uci -q get upnpd.settings.external_zone)
 [ -x "$(command -v nft)" ] && FW="fw4" || FW="fw3"
 
 . /lib/functions/network.sh

net/miniupnpd/files/miniupnpd.init

@@ -40,42 +40,42 @@ upnpd_add_custom_acl_entry() {
 upnpd() {
 	config_load "upnpd"
 	local enabled
-	config_get enabled config enabled 0
+	config_get enabled settings enabled 0
 	if [ "$enabled" != "1" ]; then
 		log "Service disabled, UCI enabled is not set"
 		return 1
 	fi
 	# Daemon
 	local enabled_protocols allow_cgnat stun_host allow_third_party_mapping ipv6_disable system_uptime log_output lease_file config_file
-	config_get enabled_protocols config enabled_protocols all
-	config_get allow_cgnat config allow_cgnat 0
-	config_get stun_host config stun_host stun.nextcloud.com
-	config_get allow_third_party_mapping config allow_third_party_mapping 0
-	config_get ipv6_disable config ipv6_disable 0
-	config_get system_uptime config system_uptime 1
-	config_get log_output config log_output
-	config_get lease_file config lease_file /run/miniupnpd.leases
-	config_get config_file config config_file
+	config_get enabled_protocols settings enabled_protocols all
+	config_get allow_cgnat settings allow_cgnat 0
+	config_get stun_host settings stun_host stun.nextcloud.com
+	config_get allow_third_party_mapping settings allow_third_party_mapping 0
+	config_get ipv6_disable settings ipv6_disable 0
+	config_get system_uptime settings system_uptime 1
+	config_get log_output settings log_output
+	config_get lease_file settings lease_file /run/miniupnpd.leases
+	config_get config_file settings config_file
 
 	# UPnP IGD
 	local upnp_igd_compat download_kbps upload_kbps friendly_name model_number serial_number presentation_url uuid http_port notify_interval
-	config_get upnp_igd_compat config upnp_igd_compat igdv1
-	config_get download_kbps config download_kbps
-	config_get upload_kbps config upload_kbps
-	config_get friendly_name config friendly_name "OpenWrt UPnP IGD & PCP"
-	config_get model_number config model_number
-	config_get serial_number config serial_number
-	config_get presentation_url config presentation_url
-	config_get uuid config uuid
-	config_get http_port config http_port 5000
-	config_get notify_interval config notify_interval
+	config_get upnp_igd_compat settings upnp_igd_compat igdv1
+	config_get download_kbps settings download_kbps
+	config_get upload_kbps settings upload_kbps
+	config_get friendly_name settings friendly_name "OpenWrt UPnP IGD & PCP"
+	config_get model_number settings model_number
+	config_get serial_number settings serial_number
+	config_get presentation_url settings presentation_url
+	config_get uuid settings uuid
+	config_get http_port settings http_port 5000
+	config_get notify_interval settings notify_interval
 
 	# External network interface
 	local external_iface external_iface6 external_zone external_ip
-	config_get external_iface config external_iface
-	config_get external_iface6 config external_iface6
-	config_get external_zone config external_zone
-	config_get external_ip config external_ip
+	config_get external_iface settings external_iface
+	config_get external_iface6 settings external_iface6
+	config_get external_zone settings external_zone
+	config_get external_ip settings external_ip
 
 	local conf ifname ifname6
 	. /lib/functions/network.sh
@@ -155,7 +155,7 @@ upnpd() {
 			[ -z "$uuid" ] && {
 				log "Generate UPnP IGD UUID"
 				uuid="$(cat /proc/sys/kernel/random/uuid)"
-				uci set upnpd.config.uuid="$uuid"
+				uci set upnpd.settings.uuid="$uuid"
 				uci commit upnpd
 			}
 			[ "$uuid" != "nocli" ] && echo "uuid=$uuid" || log "Deprecated. Set uuid to 00000000-0000-0000-0000-000000000000 instead"
@@ -282,6 +282,7 @@ upnpd_add_int_network_and_preset() {
 }
 
 upnpd_uci_migration() {
+	{ uci -q get upnpd.settings >/dev/null || ! uci -q get upnpd.config >/dev/null; } && return 0
 	log "Check UCI options in /etc/config/upnpd to be migrated to v2.0"
 
 	# Set missing enabled option to fix previously different defaults in LuCI/config (0) and init UCI (1)
@@ -508,5 +509,11 @@ upnpd_uci_migration() {
 		uci -q delete upnpd.config.internal_iface
 	fi
 
+	# Finally rename section config -> settings (v2.0)
+	if uci -q get upnpd.config >/dev/null; then
+		log "Rename section config -> settings (v2.0)" && uci rename upnpd.config="settings" ||
+			log "Error renaming the UCI section" daemon.err
+	fi
+
 	uci commit upnpd >/dev/null
 }

net/miniupnpd/files/upnpd.config

@@ -1,6 +1,6 @@
 # UPnP IGD & PCP/NAT-PMP Service Settings (v2.0)
 
-config upnpd 'config'
+config upnpd 'settings'
 	option enabled                    '0'
 	# Can be set to all/upnp-igd/pcp+nat-pmp
 	option enabled_protocols          'all'