xfrpc: allow server_addr ip and domain
authorDengfeng Liu <liudf0716@gmail.com>
Fri, 14 Oct 2022 08:36:16 +0000 (08:36 +0000)
committerRosen Penev <rosenp@gmail.com>
Fri, 21 Oct 2022 22:33:50 +0000 (15:33 -0700)
Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
net/xfrpc/files/xfrpc.init

index aa999bc68a253c26e83091aa780b92653e079d46..3b0ddedafca7d8d6d40365eb85736715ae1cb2ad 100755 (executable)
@@ -34,14 +34,16 @@ handle_xfrpc() {
                        ;;
                http|https)
                        config_get custom_domains "$name" custom_domains
-                       echo "custom_domains = $custom_domains" >> "$config"
+                       [ -z "$custom_domains" ] || echo "custom_domains = $custom_domains" >> "$config"
+                       config_get subdomain "$name" subdomain
+                       [ -z "$subdomain" ] || echo "subdomain = $subdomain" >> "$config"
                        ;;
                esac
        }
 
        if [ "$name" = "common" ]; then
                uci_validate_section xfrpc xfrp "$name" \
-                               'server_addr:ipaddr' \
+                               'server_addr:host' \
                                'server_port:uinteger' \
                                'token:string:'