From a935a21a1e48c84bdb62619d7b80aee3ded91850 Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Sat, 27 Oct 2018 13:06:27 -0500 Subject: [PATCH] Fix server name for Mailman nginx configuration Removed a hardcoded server name for the Mailman nginx configuration file and replaced with logic to inject the server name based on environment variable. --- comanage-registry-mailman/nginx/nginx.conf | 4 ++-- comanage-registry-mailman/nginx/start.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/comanage-registry-mailman/nginx/nginx.conf b/comanage-registry-mailman/nginx/nginx.conf index d09fc47..c2c2737 100644 --- a/comanage-registry-mailman/nginx/nginx.conf +++ b/comanage-registry-mailman/nginx/nginx.conf @@ -59,13 +59,13 @@ http { server { listen 80; - server_name lists-dev.sphericalcowgroup.com; + server_name %%SERVER_NAME%%; return 301 https://$server_name$request_uri; } server { listen 443 ssl; - server_name lists-dev.sphericalcowgroup.com; + server_name %%SERVER_NAME%%; ssl_certificate /etc/nginx/https.crt; ssl_certificate_key /etc/nginx/https.key; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; diff --git a/comanage-registry-mailman/nginx/start.sh b/comanage-registry-mailman/nginx/start.sh index ac8f085..3706f61 100755 --- a/comanage-registry-mailman/nginx/start.sh +++ b/comanage-registry-mailman/nginx/start.sh @@ -28,6 +28,7 @@ set -e injectable_config_vars=( MAILMAN_CORE_HOST MAILMAN_CORE_PORT + SERVER_NAME ) # Default values. @@ -62,6 +63,9 @@ if [ -n "${NGINX_DH_PARAM_FILE}" ]; then chown www-data /etc/nginx/dhparam.pem fi +# Edit the nginx configuration file in place to set the server name. +sed -i -e s@%%SERVER_NAME%%@"${SERVER_NAME:-unknown}"@ /etc/nginx/nginx.conf + # Wait for the mailman core container to be ready. until nc -z -w 1 "${MAILMAN_CORE_HOST}" "${MAILMAN_CORE_PORT}" do