Fabio/nginx-proxy-auto-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor as UPSTREAM_REGEXES for more flexibility

Browse source
This commit is contained in:
Sylvia van Os 2019-12-31 12:59:09 +01:00
parent 9740ed4818
commit e15ac5fc84
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -137,11 +137,13 @@ than a socket and expose that port.
If you use fastcgi, you can set `VIRTUAL_ROOT=xxx` for your root directory If you use fastcgi, you can set `VIRTUAL_ROOT=xxx` for your root directory
### Sending only certain file extensions upstream ### Sending only certain files upstream
You can set `UPSTREAM_EXTENSIONS=xxx` to only send certain extensions upstream. You can set `UPSTREAM_REGEXES=xxx` to only send certain requests upstream.
The rest of the files will be served locally. If you want to send multiple The rest of the files will be served locally. If you want to send multiple
extensions upstream, separate them like this: `UPSTREAM_EXTENSIONS=php|php5` regexes upstream, separate them like this: `UPSTREAM_REGEXES=/en|.*\.php|.*\.php5`
Above example will send example.com/en and all .php and .php5 files upstream.
When doing this, make sure the VIRTUAL_ROOT is also available to this container. When doing this, make sure the VIRTUAL_ROOT is also available to this container.
The easiest way to do this is defining the VOLUME in your upstream container and The easiest way to do this is defining the VOLUME in your upstream container and

16
nginx.tmpl
View file

@ -220,8 +220,8 @@ upstream {{ $upstream_name }} {
{{/* Get the VIRTUAL_ROOT By containers w/ use fastcgi root */}} {{/* Get the VIRTUAL_ROOT By containers w/ use fastcgi root */}}
{{ $vhost_root := or (first (groupByKeys $containers "Env.VIRTUAL_ROOT")) "/var/www/public" }} {{ $vhost_root := or (first (groupByKeys $containers "Env.VIRTUAL_ROOT")) "/var/www/public" }}
{{/* Which extensions to send upstream when using fastcgi, if not default, send everything upstream. Make sure the VIRTUAL_ROOT is available to this container when using this */}} {{/* Which regexes when matching to send upstream when using fastcgi. If not defined, send everything upstream. Make sure the VIRTUAL_ROOT is available to this container when using this */}}
{{ $vhost_upstream_extensions := trim (or (first (groupByKeys $containers "Env.UPSTREAM_EXTENSIONS")) "") }} {{ $vhost_upstream_regexes := trim (or (first (groupByKeys $containers "Env.UPSTREAM_REGEXES")) "") }}
{{/* Which filename to use as index file */}} {{/* Which filename to use as index file */}}
{{ $vhost_index := or (first (groupByKeys $containers "Env.INDEX")) "" }} {{ $vhost_index := or (first (groupByKeys $containers "Env.INDEX")) "" }}
@ -297,9 +297,9 @@ server {
include /etc/nginx/vhost.d/default; include /etc/nginx/vhost.d/default;
{{ end }} {{ end }}
{{ if $vhost_upstream_extensions }} {{ if $vhost_upstream_regexes }}
root {{ trim $vhost_root }}; root {{ trim $vhost_root }};
location ~* \.({{ $vhost_upstream_extensions }})$ { location ~* "^({{ $vhost_upstream_regexes }})$" {
{{ if eq $proto "uwsgi" }} {{ if eq $proto "uwsgi" }}
include uwsgi_params; include uwsgi_params;
uwsgi_pass {{ trim $proto }}://{{ trim $upstream_name }}; uwsgi_pass {{ trim $proto }}://{{ trim $upstream_name }};
@ -325,7 +325,7 @@ server {
} }
{{ end }} {{ end }}
location / { location / {
{{ if not $vhost_upstream_extensions }} {{ if not $vhost_upstream_regexes }}
{{ if eq $proto "uwsgi" }} {{ if eq $proto "uwsgi" }}
include uwsgi_params; include uwsgi_params;
uwsgi_pass {{ trim $proto }}://{{ trim $upstream_name }}; uwsgi_pass {{ trim $proto }}://{{ trim $upstream_name }};
@ -378,9 +378,9 @@ server {
include /etc/nginx/vhost.d/default; include /etc/nginx/vhost.d/default;
{{ end }} {{ end }}
{{ if $vhost_upstream_extensions }} {{ if $vhost_upstream_regexes }}
root {{ trim $vhost_root }}; root {{ trim $vhost_root }};
location ~* \.({{ $vhost_upstream_extensions }})$ { location ~* "^({{ $vhost_upstream_regexes }})$" {
{{ if eq $proto "uwsgi" }} {{ if eq $proto "uwsgi" }}
include uwsgi_params; include uwsgi_params;
uwsgi_pass {{ trim $proto }}://{{ trim $upstream_name }}; uwsgi_pass {{ trim $proto }}://{{ trim $upstream_name }};
@ -406,7 +406,7 @@ server {
} }
{{ end }} {{ end }}
location / { location / {
{{ if not $vhost_upstream_extensions }} {{ if not $vhost_upstream_regexes }}
{{ if eq $proto "uwsgi" }} {{ if eq $proto "uwsgi" }}
include uwsgi_params; include uwsgi_params;
uwsgi_pass {{ trim $proto }}://{{ trim $upstream_name }}; uwsgi_pass {{ trim $proto }}://{{ trim $upstream_name }};