From 580f89e63bdde28edb2ffb03af34b69171011dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Wollse=CC=81n?= Date: Sun, 18 May 2014 19:35:22 +0300 Subject: [PATCH 1/2] Plugin nginx-vhosts includes files in folder nginx.conf.d --- plugins/nginx-vhosts/post-deploy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/nginx-vhosts/post-deploy b/plugins/nginx-vhosts/post-deploy index b0d06e8cb..19d5f04fc 100755 --- a/plugins/nginx-vhosts/post-deploy +++ b/plugins/nginx-vhosts/post-deploy @@ -57,6 +57,7 @@ $SSL_DIRECTIVES proxy_set_header X-Forwarded-Port \$server_port; proxy_set_header X-Request-Start \$msec; } + include $DOKKU_ROOT/$APP/nginx.conf.d/*.conf; } EOF @@ -80,6 +81,7 @@ server { proxy_set_header X-Forwarded-Port \$server_port; proxy_set_header X-Request-Start \$msec; } + include $DOKKU_ROOT/$APP/nginx.conf.d/*.conf; } EOF From 26a9e2fbf23df723e323d05c1f783e93ee0d8f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Wollse=CC=81n?= Date: Sun, 16 Nov 2014 13:18:26 +0200 Subject: [PATCH 2/2] Update plugins list - VHOSTS Custom Configuration required core PR was made available in dokku core 0.3.1 --- docs/plugins.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/plugins.md b/docs/plugins.md index 40a3dedd7..c9207f96b 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -141,7 +141,7 @@ Note: The following plugins have been supplied by our community and may not have | [Debug](https://github.com/heichblatt/dokku-debug) | [heichblatt][] | | | [Pre-Deploy Tasks](https://github.com/michaelshobbs/dokku-app-predeploy-tasks) | [michaelshobbs][] | | | [Hostname](https://github.com/michaelshobbs/dokku-hostname) | [michaelshobbs][] | | -| [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration) | [motin][] | Requires https://github.com/progrium/dokku/pull/579 | +| [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration) | [motin][] | Compatible with 0.3.1+ | | [Multiple domains and per-app custom nginx.conf](https://github.com/mikexstudios/dokku-nginx-alt) | [mikexstudios][] | Works with v0.2.3 | | [Supply env vars to buildpacks](https://github.com/cameron-martin/dokku-build-env)| [cameron-martin][] | Works with v0.2.3 | | [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps) | [matto1990][] | Works with v0.2.3 |