public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

Change Nginx templates

6d7c3423

andryyy <[email protected]> 9 years ago

data/conf/nginx/server_name.active                    | 1 +
 data/conf/nginx/site.conf                             | 6 +++---
 data/conf/nginx/{ => templates}/listen_plain.template | 0
 data/conf/nginx/{ => templates}/listen_ssl.template   | 0
 data/conf/nginx/templates/server_name.template        | 1 +
 docker-compose.yml                                    | 6 ++++--
 6 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 data/conf/nginx/server_name.active
 rename data/conf/nginx/{ => templates}/listen_plain.template (100%)
 rename data/conf/nginx/{ => templates}/listen_ssl.template (100%)
 create mode 100644 data/conf/nginx/templates/server_name.template

Diff

diff --git a/data/conf/nginx/server_name.active b/data/conf/nginx/server_name.active
new file mode 100644
index 00000000..ce429200
--- /dev/null
+++ b/data/conf/nginx/server_name.active
@@ -0,0 +1 @@
+server_name logs.servercow.de autodiscover.* autoconfig.*;
diff --git a/data/conf/nginx/site.conf b/data/conf/nginx/site.conf
index 4742bb7a..67e73aed 100644
--- a/data/conf/nginx/site.conf
+++ b/data/conf/nginx/site.conf
@@ -13,7 +13,7 @@ server {
   add_header Strict-Transport-Security "max-age=15768000; includeSubDomains";
   ssl_ecdh_curve secp384r1;
   index index.php index.html;
-  server_name _ autodiscover.* autoconfig.*;
+  include /etc/nginx/conf.d/server_name.active;
   error_log  /var/log/nginx/error.log;
   access_log /var/log/nginx/access.log;
   root /web;
@@ -148,7 +148,7 @@ server {
   charset utf-8;
   override_charset on;
   index index.php index.html;
-  server_name _ autodiscover.* autoconfig.*;
+  include /etc/nginx/conf.d/server_name.active;
   error_log  /var/log/nginx/error.log;
   access_log /var/log/nginx/access.log;
   root /web;
@@ -277,4 +277,4 @@ server {
     #alias /usr/lib/GNUstep/SOGo/$1.SOGo/Resources/$2;
   }
 
-}
\ No newline at end of file
+}
diff --git a/data/conf/nginx/listen_plain.template b/data/conf/nginx/templates/listen_plain.template
similarity index 100%
rename from data/conf/nginx/listen_plain.template
rename to data/conf/nginx/templates/listen_plain.template
diff --git a/data/conf/nginx/listen_ssl.template b/data/conf/nginx/templates/listen_ssl.template
similarity index 100%
rename from data/conf/nginx/listen_ssl.template
rename to data/conf/nginx/templates/listen_ssl.template
diff --git a/data/conf/nginx/templates/server_name.template b/data/conf/nginx/templates/server_name.template
new file mode 100644
index 00000000..261a1ece
--- /dev/null
+++ b/data/conf/nginx/templates/server_name.template
@@ -0,0 +1 @@
+server_name ${MAILCOW_HOSTNAME} autodiscover.* autoconfig.*;
diff --git a/docker-compose.yml b/docker-compose.yml
index affa6364..d2444e64 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -242,12 +242,14 @@ services:
         - sogo-mailcow
         - php-fpm-mailcow
       image: nginx:mainline
-      command: /bin/bash -c "envsubst < /etc/nginx/conf.d/listen_plain.template > /etc/nginx/conf.d/listen_plain.active &&
-        envsubst < /etc/nginx/conf.d/listen_ssl.template > /etc/nginx/conf.d/listen_ssl.active &&
+      command: /bin/bash -c "envsubst < /etc/nginx/conf.d/templates/listen_plain.template > /etc/nginx/conf.d/listen_plain.active &&
+        envsubst < /etc/nginx/conf.d/templates/listen_ssl.template > /etc/nginx/conf.d/listen_ssl.active &&
+        envsubst < /etc/nginx/conf.d/templates/server_name.template > /etc/nginx/conf.d/server_name.active &&
         nginx -g 'daemon off;'"
       environment:
         - HTTPS_PORT=${HTTPS_PORT:-443}
         - HTTP_PORT=${HTTP_PORT:-80}
+        - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
       volumes:
         - ./data/web:/web:ro
         - ./data/conf/rspamd/dynmaps:/dynmaps:ro