diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-07-22 19:55:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 19:55:07 +0200 |
| commit | a8cc9ab8ea58ff2197e58368a39c4db4e0ba3e86 (patch) | |
| tree | ddb8e60106cdec01b85203bf1363fa8c8b46550a /interface-definitions | |
| parent | e09dd24cd1d7c1076dca2b30b224e17b9ae28e3a (diff) | |
| parent | 1870a3db38e6469d9216343a4dc180d859651d84 (diff) | |
| download | vyos-1x-a8cc9ab8ea58ff2197e58368a39c4db4e0ba3e86.tar.gz vyos-1x-a8cc9ab8ea58ff2197e58368a39c4db4e0ba3e86.zip | |
Merge pull request #935 from sarthurdev/pki_https
pki: https: T3642: Migrate HTTPS to use PKI configuration
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/https.xml.in | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/interface-definitions/https.xml.in b/interface-definitions/https.xml.in index b613e30c1..b65a89b56 100644 --- a/interface-definitions/https.xml.in +++ b/interface-definitions/https.xml.in @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- HTTPS configuration --> <interfaceDefinition> - <syntaxVersion component='https' version='2'></syntaxVersion> + <syntaxVersion component='https' version='3'></syntaxVersion> <node name="service"> <children> <node name="https" owner="${vyos_conf_scripts_dir}/https.py"> @@ -123,22 +123,7 @@ <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> + #include <include/pki/certificate.xml.i> <node name="certbot" owner="${vyos_conf_scripts_dir}/le_cert.py"> <properties> <help>Request or apply a letsencrypt certificate for domain-name</help> |