From 3b0a39a877540aacdae26088b2bbc1add32344b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= <lauri@pinecrypt.com>
Date: Fri, 4 Jun 2021 08:37:45 +0000
Subject: [PATCH] Use Let's Encrypt keypair filenames for easier bind mounting

---
 Dockerfile | 4 ++--
 nginx.conf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e8ded3c..af315cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ RUN nunjucks-precompile --include snippets --include views templates >> js/bundl
 RUN bash -c 'cat /usr/lib/node_modules/{jquery/dist/jquery.min.js,tether/dist/js/tether.min.js,bootstrap/dist/js/bootstrap.min.js,node-forge/dist/forge.all.min.js,qrcode-svg/dist/qrcode.min.js,timeago/jquery.timeago.js,nunjucks/browser/nunjucks-slim.min.js,xterm/lib/xterm.js} >> js/bundle.js'
 RUN bash -c 'cat /usr/lib/node_modules/{tether/dist/css/tether.min.css,bootstrap/dist/css/bootstrap.min.css,font-awesome/css/font-awesome.min.css,xterm/css/xterm.css} >> css/bundle.css'
 RUN mkdir /frontend-secrets
-RUN ln -s ../server-secrets/self_cert.pem /frontend-secrets/cert.pem
-RUN ln -s ../server-secrets/self_key.pem /frontend-secrets/key.pem
+RUN ln -s ../server-secrets/self_cert.pem /frontend-secrets/fullchain.pem
+RUN ln -s ../server-secrets/self_key.pem /frontend-secrets/privkey.pem
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT /entrypoint.sh
diff --git a/nginx.conf b/nginx.conf
index 41274f8..ba632c5 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -94,8 +94,8 @@ http {
         add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
 
         # Bind mount this directory to use Let's Encrypt keypair for frontend
-        ssl_certificate /frontend-secrets/cert.pem;
-        ssl_certificate_key /frontend-secrets/key.pem;
+        ssl_certificate /frontend-secrets/fullchain.pem;
+        ssl_certificate_key /frontend-secrets/privkey.pem;
 
         #proxy pass event
         location /api/event/ {