From 1ace4a35237889bceff7309df0c687bf32ab89a9 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@sentrium.io>
Date: Tue, 27 Aug 2019 08:13:02 -0500
Subject: [service https] T1443: Correct the use of listen/server_name
 directives

---
 interface-definitions/https.xml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/https.xml b/interface-definitions/https.xml
index 13d5c43ea..7a87133f3 100644
--- a/interface-definitions/https.xml
+++ b/interface-definitions/https.xml
@@ -9,7 +9,7 @@
           <priority>1001</priority>
         </properties>
         <children>
-          <leafNode name="listen-address">
+          <tagNode name="listen-addresses">
             <properties>
               <help>Addresses to listen for HTTPS requests</help>
               <valueHelp>
@@ -20,13 +20,25 @@
                 <format>ipv6</format>
                 <description>HTTPS IPv6 address</description>
               </valueHelp>
-              <multi/>
+              <valueHelp>
+                <format>'*'</format>
+                <description>any</description>
+              </valueHelp>
               <constraint>
                 <validator name="ipv4-address"/>
                 <validator name="ipv6-address"/>
+                <regex>^\\*$</regex>
               </constraint>
             </properties>
-          </leafNode>
+            <children>
+              <leafNode name="server-names">
+                <properties>
+                  <help>Server names: exact, wildcard, regex, or '_' (any)</help>
+                  <multi/>
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
           <node name="certificates">
             <properties>
               <help>TLS certificates</help>
-- 
cgit v1.2.3