EFRS-1357 Update nginx ssl config with templates

gusdoe · Jan 23, 2023 · d87f4d2 · d87f4d2
1 parent 4a535c0
commit d87f4d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/dev/docker-compose.env.yml b/dev/docker-compose.env.yml
@@ -15,9 +15,10 @@ volumes:
 services:
   compreface-fe:
     volumes:
-      - ./nginx/conf.d:/etc/nginx/conf.d:ro
-      - /etc/letsencrypt/archive/$HOSTNAME/fullchain1.pem:/etc/nginx/ssl/fullchain.pem:ro
-      - /etc/letsencrypt/archive/$HOSTNAME/privkey1.pem:/etc/nginx/ssl/privkey.pem:ro
+      - ./nginx/templates:/etc/nginx/templates:ro
+      - /etc/letsencrypt:/etc/letsencrypt:ro
+    environment:
+      - NGINX_HOST=$HOSTNAME
     ports:
       - "8000:80"
       - "443:443"
diff --git a/dev/nginx/conf.d/nginx.conf → dev/nginx/templates/nginx.conf.template b/dev/nginx/conf.d/nginx.conf → dev/nginx/templates/nginx.conf.template
@@ -19,8 +19,8 @@ server {
 server {
     listen 443 ssl;
     server_name ui;
-    ssl_certificate /etc/nginx/ssl/fullchain.pem;
-    ssl_certificate_key /etc/nginx/ssl/privkey.pem;
+    ssl_certificate /etc/letsencrypt/live/$NGINX_HOST/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/$NGINX_HOST/privkey.pem;
 
     client_max_body_size 10M;