From 8416fdc0274ce3686d0ec1d4979113e9aa80e0f4 Mon Sep 17 00:00:00 2001
From: Mark Calvert <markcalvert84@gmail.com>
Date: Thu, 28 Mar 2024 15:49:04 +1300
Subject: [PATCH] Update NGINX configuration and add CKAN server name

---
 .env.dbca                         | 1 +
 nginx/Dockerfile                  | 3 ++-
 nginx/setup/default.conf.template | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.env.dbca b/.env.dbca
index c8e7bb3e..b17148bb 100644
--- a/.env.dbca
+++ b/.env.dbca
@@ -74,6 +74,7 @@ CKANEXT__XLOADER__JOBS_DB__URI=$CKAN_SQLALCHEMY_URL
 # NGINX
 NGINX_PORT=80
 NGINX_SSLPORT=443
+CKAN_SERVER_NAME=localhost
 
 # Extensions
 
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index aed247e3..47e072d3 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -9,7 +9,7 @@ RUN apk update --no-cache && \
 COPY setup/nginx.conf ${NGINX_DIR}/nginx.conf
 COPY setup/index.html /usr/share/nginx/html/index.html
 COPY setup/default.conf ${NGINX_DIR}/conf.d/
-COPY setup/default.conf.template ${NGINX_DIR}/templates/
+COPY setup/default.conf.template ${NGINX_DIR}/
 
 RUN mkdir -p ${NGINX_DIR}/certs
 
@@ -29,4 +29,5 @@ ENTRYPOINT \
     -out ${NGINX_DIR}/certs/ckan-local.crt \
     -days 365 && \
   /usr/sbin/crond && \
+  mkdir -p ${NGINX_DIR}/templates && mv ${NGINX_DIR}/default.conf.template ${NGINX_DIR}/templates/default.conf.template && \
   /docker-entrypoint.sh nginx -g 'daemon off;'
diff --git a/nginx/setup/default.conf.template b/nginx/setup/default.conf.template
index ca80d5bf..c5cdafcf 100644
--- a/nginx/setup/default.conf.template
+++ b/nginx/setup/default.conf.template
@@ -3,7 +3,7 @@ server {
     #listen  [::]:80;
     listen       443 ssl;
     listen  [::]:443 ssl;
-    server_name  localhost;
+    server_name  ${CKAN_SERVER_NAME};
     ssl_certificate /etc/nginx/certs/ckan-local.crt;
     ssl_certificate_key /etc/nginx/certs/ckan-local.key;