X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/fd654a4138340c1ddb0dcc5a406ede4b7c62b13f..4bf9501a14f86845865244ee3ffb03a34707d36c:/test/salt/pillar/examples/nginx_workbench2_configuration.sls diff --git a/test/salt/pillar/examples/nginx_workbench2_configuration.sls b/test/salt/pillar/examples/nginx_workbench2_configuration.sls index 9718a96..9c2e0fa 100644 --- a/test/salt/pillar/examples/nginx_workbench2_configuration.sls +++ b/test/salt/pillar/examples/nginx_workbench2_configuration.sls @@ -1,6 +1,4 @@ --- -{% set nginx_log = '/var/log/nginx' %} - ### ARVADOS arvados: config: @@ -17,7 +15,7 @@ nginx: overwrite: true config: - server: - - server_name: workbench2.example.net + - server_name: workbench2.fixme.example.net - listen: - 80 - location /.well-known: @@ -30,7 +28,7 @@ nginx: overwrite: true config: - server: - - server_name: workbench2.example.net + - server_name: workbench2.fixme.example.net - listen: - 443 http2 ssl - index: index.html index.htm @@ -39,7 +37,9 @@ nginx: - try_files: '$uri $uri/ /index.html' - 'if (-f $document_root/maintenance.html)': - return: 503 + - location /config.json: + - return: {{ "200 '" ~ '{"API_HOST":"fixme.example.net"}' ~ "'" }} # - include: 'snippets/letsencrypt.conf' - include: 'snippets/snakeoil.conf' - - access_log: {{ nginx_log }}/workbench2.example.net.access.log combined - - error_log: {{ nginx_log }}/workbench2.example.net.error.log + - access_log: /var/log/nginx/workbench2.fixme.example.net.access.log combined + - error_log: /var/log/nginx/workbench2.fixme.example.net.error.log