From: Javier Bértoli <javier@netmanagers.com.ar>
Date: Mon, 17 May 2021 17:15:20 +0000 (-0300)
Subject: test(examples): remove workbench upstream in nginx
X-Git-Url: https://git.arvados.org/arvados-formula.git/commitdiff_plain/257615eab47f9d4bf64694dc0aac9dfff4e8edc4?ds=sidebyside

test(examples): remove workbench upstream in nginx
---

diff --git a/test/integration/workbench/controls/services_spec.rb b/test/integration/workbench/controls/services_spec.rb
index 006d96f..e7910c9 100644
--- a/test/integration/workbench/controls/services_spec.rb
+++ b/test/integration/workbench/controls/services_spec.rb
@@ -9,7 +9,7 @@ control 'arvados workbench service' do
     it { should be_running }
   end
 
-  describe port(9000) do
+  describe port(443) do
     proc = case os[:name]
            when 'centos'
              # Centos ps adds an extra colon and the end of the process
diff --git a/test/salt/pillar/examples/nginx_workbench_configuration.sls b/test/salt/pillar/examples/nginx_workbench_configuration.sls
index fbadc58..e34ad2d 100644
--- a/test/salt/pillar/examples/nginx_workbench_configuration.sls
+++ b/test/salt/pillar/examples/nginx_workbench_configuration.sls
@@ -12,15 +12,6 @@ arvados:
 
 ### NGINX
 nginx:
-  ### SERVER
-  server:
-    config:
-
-      ### STREAMS
-      http:
-        upstream workbench_upstream:
-          - server: 'workbench.internal:9000 fail_timeout=10s'
-
   ### SITES
   servers:
     managed:
@@ -48,30 +39,12 @@ nginx:
               - 443 http2 ssl
             - index: index.html index.htm
             - location /:
-              - proxy_pass: 'http://workbench_upstream'
-              - proxy_read_timeout: 300
-              - proxy_connect_timeout: 90
-              - proxy_redirect: 'off'
-              - proxy_set_header: X-Forwarded-Proto https
-              - proxy_set_header: 'Host $http_host'
-              - proxy_set_header: 'X-Real-IP $remote_addr'
-              - proxy_set_header: 'X-Forwarded-For $proxy_add_x_forwarded_for'
+            - root: /var/www/arvados-workbench/current/public
+            - passenger_enabled: 'on'
             - include: 'snippets/ssl_hardening_default.conf'
             # - include: 'snippets/letsencrypt.conf'
             - include: 'snippets/ssl_snakeoil.conf'
+            # yamllint disable-line rule:line-length
             - access_log: /var/log/nginx/workbench.fixme.example.net.access.log combined
             - error_log: /var/log/nginx/workbench.fixme.example.net.error.log
 
-      arvados_workbench_upstream.conf:
-        enabled: true
-        overwrite: true
-        config:
-          - server:
-            - listen: 'workbench.internal:9000'
-            - server_name: workbench
-            - root: /var/www/arvados-workbench/current/public
-            - index:  index.html index.htm
-            - passenger_enabled: 'on'
-            # yamllint disable-line rule:line-length
-            - access_log: /var/log/nginx/workbench.fixme.example.net-upstream.access.log combined
-            - error_log: /var/log/nginx/workbench.fixme.example.net-upstream.error.log