github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[ci skip] move nginx upstream blocks to the bottom in docs examples

Browse Source
This commit is contained in:
Michael Hobbs
2016-06-02 13:00:39 -07:00
parent 848f92ef7f
commit a9fd2cdbf6
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/deployment/ssl-configuration.md
View File

@@ -84,12 +84,6 @@ Your application has access to the HTTP headers `X-Forwarded-Proto`, `X-Forwarde
If your server runs behind an HTTP/S load balancer, then Nginx will see all requests as coming from the load balancer. If your load balancer sets the `X-Forwarded-` headers, you can tell Nginx to pass these headers from load balancer to your application by using the following [nginx custom template](/dokku/nginx/#customizing-the-nginx-configuration) If your server runs behind an HTTP/S load balancer, then Nginx will see all requests as coming from the load balancer. If your load balancer sets the `X-Forwarded-` headers, you can tell Nginx to pass these headers from load balancer to your application by using the following [nginx custom template](/dokku/nginx/#customizing-the-nginx-configuration)
```shell ```shell
upstream {{ .APP }} {
{{ range .DOKKU_APP_LISTENERS | split " " }}
server {{ . }};
{{ end }}
}
server { server {
listen [::]:{{ .NGINX_PORT }}; listen [::]:{{ .NGINX_PORT }};
listen {{ .NGINX_PORT }}; listen {{ .NGINX_PORT }};
@@ -113,6 +107,12 @@ server {
} }
include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf; include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
} }
upstream {{ .APP }} {
{{ range .DOKKU_APP_LISTENERS | split " " }}
server {{ . }};
{{ end }}
}
``` ```
Only use this option if: Only use this option if:

24
docs/nginx.md
View File

@@ -25,11 +25,6 @@ Dokku uses a templating library by the name of [sigil](https://github.com/glider
Use case: add an `X-Served-By` header to requests Use case: add an `X-Served-By` header to requests
``` ```
upstream {{ .APP }} {
{{ range .DOKKU_APP_LISTENERS | split " " }}
server {{ . }};
{{ end }}
}
server { server {
listen [::]:{{ .NGINX_PORT }}; listen [::]:{{ .NGINX_PORT }};
listen {{ .NGINX_PORT }}; listen {{ .NGINX_PORT }};
@@ -39,7 +34,7 @@ server {
# set a custom header for requests # set a custom header for requests
add_header X-Served-By www-ec2-01; add_header X-Served-By www-ec2-01;
gzip on; gzip on;
gzip_min_length 1100; gzip_min_length 1100;
gzip_buffers 4 32k; gzip_buffers 4 32k;
@@ -60,6 +55,12 @@ server {
} }
include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf; include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
} }
upstream {{ .APP }} {
{{ range .DOKKU_APP_LISTENERS | split " " }}
server {{ . }};
{{ end }}
}
``` ```
### Available template variables ### Available template variables
@@ -82,11 +83,6 @@ server {
### Example HTTP to HTTPS Custom Template ### Example HTTP to HTTPS Custom Template
Use case: a simple dockerfile app that includes `EXPOSE 80` Use case: a simple dockerfile app that includes `EXPOSE 80`
``` ```
upstream {{ .APP }} {
{{ range .DOKKU_APP_LISTENERS | split " " }}
server {{ . }};
{{ end }}
}
server { server {
listen [::]:80; listen [::]:80;
listen 80; listen 80;
@@ -123,6 +119,12 @@ server {
} }
include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf; include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
} }
upstream {{ .APP }} {
{{ range .DOKKU_APP_LISTENERS | split " " }}
server {{ . }};
{{ end }}
}
``` ```
### Customizing via configuration files included by the default templates ### Customizing via configuration files included by the default templates