[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: openvpn: fix uci-defaults script (coolsnowwolf#5103)
alexliu269 · Jul 14, 2020 · 3362d1a · 3362d1a
2 parents c277517 + fc0516e
commit 3362d1a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn b/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+openvpn_port="$(uci -q get openvpn.myvpn.port)"
+[ -z "$openvpn_port" ] && openvpn_port=1194
+
 uci -q batch <<-EOF >/dev/null
 	delete network.vpn0
 	set network.vpn0=interface
@@ -14,7 +17,7 @@ uci -q batch <<-EOF >/dev/null
 	set firewall.openvpn.target='ACCEPT'
 	set firewall.openvpn.src='wan'
 	set firewall.openvpn.proto='tcp udp'
-	set firewall.openvpn.dest_port='1194'
+	set firewall.openvpn.dest_port="$openvpn_port"
 
 	delete firewall.vpn
 	set firewall.vpn=zone