From 6ff1b0eb71fde3034de07add57e54314eb96001f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szekeres=20Ba=CC=81lint?= <szekeres.balint@hps.hu>
Date: Sun, 11 Mar 2018 18:12:19 +0100
Subject: [PATCH] fix subdomain server certificate path fixes #10

---
 public/assets/js/app.js                     | 4 ++--
 public/templates/conf/example.com.conf.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/assets/js/app.js b/public/assets/js/app.js
index 7e882ec..a14180b 100644
--- a/public/assets/js/app.js
+++ b/public/assets/js/app.js
@@ -130,7 +130,7 @@
 
 		$scope.sslCertificate = function() {
 			if ($scope.isCertLetsEncrypt()) {
-				return '/etc/letsencrypt/live/' + $scope.domain() + '/fullchain.pem'
+				return '/etc/letsencrypt/live/' + $scope.domain() + '/fullchain.pem';
 			}
 
 			if ($scope.data.ssl_certificate) {
@@ -142,7 +142,7 @@
 
 		$scope.sslCertificateKey = function() {
 			if ($scope.isCertLetsEncrypt()) {
-				return '/etc/letsencrypt/live/' + $scope.domain() + '/privkey.pem'
+				return '/etc/letsencrypt/live/' + $scope.domain() + '/privkey.pem';
 			}
 
 			if ($scope.data.ssl_certificate_key) {
diff --git a/public/templates/conf/example.com.conf.html b/public/templates/conf/example.com.conf.html
index 749ab82..275f202 100644
--- a/public/templates/conf/example.com.conf.html
+++ b/public/templates/conf/example.com.conf.html
@@ -142,8 +142,8 @@ server {
 
 	# SSL
 	include _ssl.conf;
-	ssl_certificate /etc/letsencrypt/live/{{ domain() }}/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/{{ domain() }}/privkey.pem;<!--
+	ssl_certificate {{ sslCertificate() }};
+	ssl_certificate_key {{ sslCertificateKey() }};<!--
 
 	✔ Let's Encrypt --><span ng-if="isCertLetsEncrypt()">
 	ssl_trusted_certificate /etc/letsencrypt/live/{{ domain() }}/fullchain.pem;</span></span>