summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2020-02-05 09:35:30 -0600
committerGitHub <noreply@github.com>2020-02-05 09:35:30 -0600
commit64d39998499df772e00d664f776815f8b7b6b3bd (patch)
tree00bf8dea8636a7b30d540f35382257007208f3aa /interface-definitions
parenteff95db0fbd75bc7fe06272f5816121f1773549f (diff)
parente45cc2e9e6d555329160624988fd4ff2146aabcb (diff)
downloadvyos-1x-64d39998499df772e00d664f776815f8b7b6b3bd.tar.gz
vyos-1x-64d39998499df772e00d664f776815f8b7b6b3bd.zip
Merge pull request #211 from jestabro/T1585
service https: T1585: add support for letsencrypt certificates service https: T1443: reorder elements for clarity
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/https.xml.in65
1 files changed, 41 insertions, 24 deletions
diff --git a/interface-definitions/https.xml.in b/interface-definitions/https.xml.in
index 4c91bbd94..4f940f7f6 100644
--- a/interface-definitions/https.xml.in
+++ b/interface-definitions/https.xml.in
@@ -51,30 +51,6 @@
</leafNode>
</children>
</tagNode>
- <node name="certificates">
- <properties>
- <help>TLS certificates</help>
- </properties>
- <children>
- <node name="system-generated-certificate" owner="${vyos_conf_scripts_dir}/vyos_cert.py">
- <properties>
- <help>Use an automatically generated self-signed certificate</help>
- <valueless/>
- </properties>
- <children>
- <leafNode name="lifetime">
- <properties>
- <help>Lifetime in days; default is 365</help>
- <valueHelp>
- <format>1-65535</format>
- <description>Number of days</description>
- </valueHelp>
- </properties>
- </leafNode>
- </children>
- </node>
- </children>
- </node>
<node name="api" owner="${vyos_conf_scripts_dir}/http-api.py">
<properties>
<help>VyOS HTTP API configuration</help>
@@ -127,6 +103,47 @@
</leafNode>
</children>
</node>
+ <node name="certificates">
+ <properties>
+ <help>TLS certificates</help>
+ </properties>
+ <children>
+ <node name="system-generated-certificate" owner="${vyos_conf_scripts_dir}/vyos_cert.py">
+ <properties>
+ <help>Use an automatically generated self-signed certificate</help>
+ </properties>
+ <children>
+ <leafNode name="lifetime">
+ <properties>
+ <help>Lifetime in days; default is 365</help>
+ <valueHelp>
+ <format>1-65535</format>
+ <description>Number of days</description>
+ </valueHelp>
+ </properties>
+ </leafNode>
+ </children>
+ </node>
+ <node name="certbot" owner="${vyos_conf_scripts_dir}/le_cert.py">
+ <properties>
+ <help>Request or apply a letsencrypt certificate for domain-name</help>
+ </properties>
+ <children>
+ <leafNode name="domain-name">
+ <properties>
+ <help>Domain name(s) for which to obtain certificate</help>
+ <multi/>
+ </properties>
+ </leafNode>
+ <leafNode name="email">
+ <properties>
+ <help>Email address to associate with certificate</help>
+ </properties>
+ </leafNode>
+ </children>
+ </node>
+ </children>
+ </node>
</children>
</node>
</children>