summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorsarthurdev <965089+sarthurdev@users.noreply.github.com>2021-07-22 12:08:19 +0200
committersarthurdev <965089+sarthurdev@users.noreply.github.com>2021-07-22 16:55:10 +0200
commit1870a3db38e6469d9216343a4dc180d859651d84 (patch)
treeddb8e60106cdec01b85203bf1363fa8c8b46550a /data
parente09dd24cd1d7c1076dca2b30b224e17b9ae28e3a (diff)
downloadvyos-1x-1870a3db38e6469d9216343a4dc180d859651d84.tar.gz
vyos-1x-1870a3db38e6469d9216343a4dc180d859651d84.zip
pki: https: T3642: Migrate HTTPS to use PKI configuration
Diffstat (limited to 'data')
-rw-r--r--data/configd-include.json3
-rw-r--r--data/templates/https/nginx.default.tmpl3
2 files changed, 3 insertions, 3 deletions
diff --git a/data/configd-include.json b/data/configd-include.json
index a03360bdb..3b4e2925b 100644
--- a/data/configd-include.json
+++ b/data/configd-include.json
@@ -69,6 +69,5 @@
"vpn_pptp.py",
"vpn_sstp.py",
"vrf.py",
-"vrrp.py",
-"vyos_cert.py"
+"vrrp.py"
]
diff --git a/data/templates/https/nginx.default.tmpl b/data/templates/https/nginx.default.tmpl
index 916764410..5459fe98d 100644
--- a/data/templates/https/nginx.default.tmpl
+++ b/data/templates/https/nginx.default.tmpl
@@ -30,7 +30,8 @@ server {
include {{ server.certbot_dir }}/options-ssl-nginx.conf;
ssl_dhparam {{ server.certbot_dir }}/ssl-dhparams.pem;
{% elif server.vyos_cert %}
- include {{ server.vyos_cert.conf }};
+ ssl_certificate {{ server.vyos_cert.crt }};
+ ssl_certificate_key {{ server.vyos_cert.key }};
{% else %}
#
# Self signed certs generated by the ssl-cert package