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/https.xml')

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


From e695dee0f587285526e947e0e4ae5cd6581e9f12 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Wed, 4 Sep 2019 17:08:36 +0200
Subject: [service https] T1443: use "listen-address" option instead of
 "listen-addresses" to follow the established convention.

---
 interface-definitions/https.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'interface-definitions/https.xml')

diff --git a/interface-definitions/https.xml b/interface-definitions/https.xml
index 7a87133f3..a3bcacc09 100644
--- a/interface-definitions/https.xml
+++ b/interface-definitions/https.xml
@@ -9,7 +9,7 @@
           <priority>1001</priority>
         </properties>
         <children>
-          <tagNode name="listen-addresses">
+          <tagNode name="listen-address">
             <properties>
               <help>Addresses to listen for HTTPS requests</help>
               <valueHelp>
-- 
cgit v1.2.3


From b142ab9f5093e10915cba08852f75a94be0b9ee6 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Wed, 4 Sep 2019 18:15:27 +0200
Subject: [service https] T1443: rename "server-names" option to "server-name".

---
 interface-definitions/https.xml | 2 +-
 src/conf_mode/https.py          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'interface-definitions/https.xml')

diff --git a/interface-definitions/https.xml b/interface-definitions/https.xml
index a3bcacc09..2fb3bf082 100644
--- a/interface-definitions/https.xml
+++ b/interface-definitions/https.xml
@@ -31,7 +31,7 @@
               </constraint>
             </properties>
             <children>
-              <leafNode name="server-names">
+              <leafNode name="server-name">
                 <properties>
                   <help>Server names: exact, wildcard, regex, or '_' (any)</help>
                   <multi/>
diff --git a/src/conf_mode/https.py b/src/conf_mode/https.py
index 2e7aeb5a4..f948063e9 100755
--- a/src/conf_mode/https.py
+++ b/src/conf_mode/https.py
@@ -137,8 +137,8 @@ def get_config():
         addrs = {}
         for addr in conf.list_nodes('listen-address'):
             addrs[addr] = ['_']
-            if conf.exists('listen-address {0} server-names'.format(addr)):
-                names = conf.return_values('listen-address {0} server-names'.format(addr))
+            if conf.exists('listen-address {0} server-name'.format(addr)):
+                names = conf.return_values('listen-address {0} server-name'.format(addr))
                 addrs[addr] = names[:]
         https['listen_addresses'] = addrs
 
-- 
cgit v1.2.3