diff options
author | Daniil Baturin <daniil@baturin.org> | 2019-09-04 18:15:27 +0200 |
---|---|---|
committer | Daniil Baturin <daniil@baturin.org> | 2019-09-04 18:39:45 +0200 |
commit | 3409c233105b8a099134957a509a4a825c45e0fa (patch) | |
tree | 8981a9b179cb7d5128b1213d24d701fa53521a7e | |
parent | f0281a9bbb77ceb1ed37edbfb2e1dccbafa6bedf (diff) | |
download | vyos-1x-3409c233105b8a099134957a509a4a825c45e0fa.tar.gz vyos-1x-3409c233105b8a099134957a509a4a825c45e0fa.zip |
[service https] T1443: rename "server-names" option to "server-name".
-rw-r--r-- | interface-definitions/https.xml | 2 | ||||
-rwxr-xr-x | src/conf_mode/https.py | 4 |
2 files changed, 3 insertions, 3 deletions
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 |