Explorar el Código

Add support for vhosts.d/defaults file with default vhost options

- Only used if it exists and a vhost-specific one doesn't
Richard Bateman hace 9 años
padre
commit
b131b00e19
Se han modificado 2 ficheros con 9 adiciones y 0 borrados
  1. 5 0
      README.md
  2. 4 0
      nginx.tmpl

+ 5 - 0
README.md

@@ -193,3 +193,8 @@ If you are using multiple hostnames for a single container (e.g. `VIRTUAL_HOST=e
 
     $ { echo 'server_tokens off;'; echo 'client_max_body_size 100m;'; } > /path/to/vhost.d/www.example.com
     $ ln -s /path/to/vhost.d/www.example.com /path/to/vhost.d/example.com
+
+#### Per-VIRTUAL_HOST default configuration
+
+If you want most of your virtual hosts to use a default single configuration and then override on a few specific ones, add those settings to the `/etc/nginx/vhost.d/default` file. This file
+will be used on any virtual host which does not have a `/etc/nginx/vhost.d/{VIRTUAL_HOST}` file associated with it.

+ 4 - 0
nginx.tmpl

@@ -125,6 +125,8 @@ server {
 
 	{{ if (exists (printf "/etc/nginx/vhost.d/%s" $host)) }}
 	include {{ printf "/etc/nginx/vhost.d/%s" $host }};
+	{{ else if (exists /etc/vhost.d/defaults) }}
+	include /etc/nginx/vhost.d/defaults
 	{{ end }}
 
 	location / {
@@ -143,6 +145,8 @@ server {
 
 	{{ if (exists (printf "/etc/nginx/vhost.d/%s" $host)) }}
 	include {{ printf "/etc/nginx/vhost.d/%s" $host }};
+	{{ else if (exists /etc/vhost.d/defaults) }}
+	include /etc/nginx/vhost.d/defaults
 	{{ end }}
 
 	location / {