From b131b00e1984adb54f6905f92ba38ca83d181e1f Mon Sep 17 00:00:00 2001 From: Richard Bateman Date: Fri, 14 Aug 2015 11:34:56 -0600 Subject: [PATCH] Add support for vhosts.d/defaults file with default vhost options - Only used if it exists and a vhost-specific one doesn't --- README.md | 5 +++++ nginx.tmpl | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 891d8fc..6c36a9f 100644 --- a/README.md +++ b/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. diff --git a/nginx.tmpl b/nginx.tmpl index fba5e74..b9b06dc 100644 --- a/nginx.tmpl +++ b/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 / {