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:40:16 +0200 |
| commit | b142ab9f5093e10915cba08852f75a94be0b9ee6 (patch) | |
| tree | c73547b785682a136cfea7bc7aa0b312c0bebe58 | |
| parent | 77e4de232feea979ce55abd60d7dc9352b5bfe86 (diff) | |
| download | vyos-1x-b142ab9f5093e10915cba08852f75a94be0b9ee6.tar.gz vyos-1x-b142ab9f5093e10915cba08852f75a94be0b9ee6.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 |