feat(components,version): add extra components, new version

[arvados-formula.git] / 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 15cc63d7280015ef0f87e9b872cd270a1b27a759..43701f34a7bc8f241402ccee41e14b3f74d019d1 100644 (file)
--- 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