X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/fd654a4138340c1ddb0dcc5a406ede4b7c62b13f..4bf9501a14f86845865244ee3ffb03a34707d36c:/test/salt/pillar/examples/nginx_controller_configuration.sls diff --git a/test/salt/pillar/examples/nginx_controller_configuration.sls b/test/salt/pillar/examples/nginx_controller_configuration.sls index 15cc63d..43701f3 100644 --- a/test/salt/pillar/examples/nginx_controller_configuration.sls +++ b/test/salt/pillar/examples/nginx_controller_configuration.sls @@ -1,19 +1,16 @@ --- -{% set nginx_log = '/var/log/nginx' %} - ### NGINX nginx: ### SERVER server: config: - ### STREAMS http: 'geo $external_client': default: 1 - '127.0.0.0/24': 0 + '127.0.0.0/8': 0 upstream controller_upstream: - - server: 'localhost:8003 fail_timeout=10s' + - server: '127.0.0.2:8003 fail_timeout=10s' ### SITES servers: @@ -24,7 +21,7 @@ nginx: overwrite: true config: - server: - - server_name: example.net api.example.net + - server_name: fixme.example.net - listen: - 80 default - location /.well-known: @@ -37,7 +34,7 @@ nginx: overwrite: true config: - server: - - server_name: example.net + - server_name: fixme.example.net - listen: - 443 http2 ssl - index: index.html index.htm @@ -53,6 +50,6 @@ nginx: - proxy_set_header: 'X-External-Client $external_client' # - include: 'snippets/letsencrypt.conf' - include: 'snippets/snakeoil.conf' - - access_log: {{ nginx_log }}/example.net.access.log combined - - error_log: {{ nginx_log }}/example.net.error.log + - access_log: /var/log/nginx/fixme.example.net.access.log combined + - error_log: /var/log/nginx/fixme.example.net.error.log - client_max_body_size: 128m