From 1870a3db38e6469d9216343a4dc180d859651d84 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Thu, 22 Jul 2021 12:08:19 +0200
Subject: pki: https: T3642: Migrate HTTPS to use PKI configuration

---
 data/configd-include.json               | 3 +--
 data/templates/https/nginx.default.tmpl | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'data')

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
-- 
cgit v1.2.3