docs(examples): improve consistency in naming

diff --git a/test/integration/workbench/controls/services_spec.rb b/test/integration/workbench/controls/services_spec.rb
index 15ae30f550a15631636d5019e01c02c7a3f35fa8..f4e6dd28035824778d07336a7e1b499e1c01be1b 100644 (file)
--- a/test/integration/workbench/controls/services_spec.rb
+++ b/test/integration/workbench/controls/services_spec.rb
@@ -4,7 +4,7 @@ control 'arvados workbench service' do
   impact 0.5
   title 'should be running and enabled'
 
   impact 0.5
   title 'should be running and enabled'
 

-  describe service('nginx') do
+  describe service('ssh') do

     it { should be_enabled }
     it { should be_running }
   end
     it { should be_enabled }
     it { should be_running }
   end

diff --git a/test/salt/pillar/examples/nginx_controller_configuration.sls b/test/salt/pillar/examples/nginx_controller_configuration.sls
index 43701f34a7bc8f241402ccee41e14b3f74d019d1..20e944561826bc9494e94b974c6d77efa019d081 100644 (file)
--- a/test/salt/pillar/examples/nginx_controller_configuration.sls
+++ b/test/salt/pillar/examples/nginx_controller_configuration.sls
@@ -29,7 +29,7 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
             - location /:
               - return: '301 https://$host$request_uri'
 

-      arvados_controller:
+      arvados_controller_ssl:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config:

diff --git a/test/salt/pillar/examples/nginx_keepproxy_configuration.sls b/test/salt/pillar/examples/nginx_keepproxy_configuration.sls
index 2485b37eb99dfee4556e6aa367f76c0547576db7..41871c8c63a5ae044cc7580b6672730324706b8d 100644 (file)
--- a/test/salt/pillar/examples/nginx_keepproxy_configuration.sls
+++ b/test/salt/pillar/examples/nginx_keepproxy_configuration.sls
@@ -12,7 +12,7 @@ nginx:
   servers:
     managed:
       ### DEFAULT
   servers:
     managed:
       ### DEFAULT

-      arvados_keep_default:
+      arvados_keepproxy_default:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config:


@@ -25,7 +25,7 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
             - location /:
               - return: '301 https://$host$request_uri'
 

-      arvados_keepproxy:
+      arvados_keepproxy_default:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config:

diff --git a/test/salt/pillar/examples/nginx_keepweb_configuration.sls b/test/salt/pillar/examples/nginx_keepweb_configuration.sls
index cbc4aef192420dcc6cde6fbefd556843d6b751d2..6547e82894781116c2c08a9c359874bf9f81f1d3 100644 (file)
--- a/test/salt/pillar/examples/nginx_keepweb_configuration.sls
+++ b/test/salt/pillar/examples/nginx_keepweb_configuration.sls
@@ -12,7 +12,7 @@ nginx:
   servers:
     managed:
       ### DEFAULT
   servers:
     managed:
       ### DEFAULT

-      arvados_collections_default:
+      arvados_collections_download_default:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config:


@@ -26,7 +26,7 @@ nginx:
               - return: '301 https://$host$request_uri'
 
       ### COLLECTIONS / DOWNLOAD
               - return: '301 https://$host$request_uri'
 
       ### COLLECTIONS / DOWNLOAD

-      arvados_collections_downloads:
+      arvados_collections_download_ssl:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config:

diff --git a/test/salt/pillar/examples/nginx_webshell_configuration.sls b/test/salt/pillar/examples/nginx_webshell_configuration.sls
index 33f3dfd3a25e6cbf684aa2bbabd67436d0540cd0..4a59cc5d069c8f703de603b5d78e4877caaa5148 100644 (file)
--- a/test/salt/pillar/examples/nginx_webshell_configuration.sls
+++ b/test/salt/pillar/examples/nginx_webshell_configuration.sls
@@ -13,7 +13,7 @@ nginx:
   ### SITES
   servers:
     managed:
   ### SITES
   servers:
     managed:

-      arvados_webshell:
+      arvados_webshell_default:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config:


@@ -26,7 +26,7 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
             - location /:
               - return: '301 https://$host$request_uri'
 

-      arvados_webshell-ssl:
+      arvados_webshell_ssl:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config:

diff --git a/test/salt/pillar/examples/nginx_websocket_configuration.sls b/test/salt/pillar/examples/nginx_websocket_configuration.sls
index 01b77888a2af1afc19f3555dfce8e9a2d512da1b..d7e75c9328b8cda2f99efd2a673fcaf3751a0d89 100644 (file)
--- a/test/salt/pillar/examples/nginx_websocket_configuration.sls
+++ b/test/salt/pillar/examples/nginx_websocket_configuration.sls
@@ -12,7 +12,7 @@ nginx:
   servers:
     managed:
       ### DEFAULT
   servers:
     managed:
       ### DEFAULT

-      arvados_ws_default:
+      arvados_websocket_default:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config:


@@ -25,7 +25,7 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
             - location /:
               - return: '301 https://$host$request_uri'
 

-      arvados_websocket:
+      arvados_websocket_ssl:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config:

diff --git a/test/salt/pillar/examples/nginx_workbench2_configuration.sls b/test/salt/pillar/examples/nginx_workbench2_configuration.sls
index 9c2e0fa0f10f94ee788a7dad4cf12fcfe8f7ac52..f8946f47bed9961115b8af4b1a924729d8d4636d 100644 (file)
--- a/test/salt/pillar/examples/nginx_workbench2_configuration.sls
+++ b/test/salt/pillar/examples/nginx_workbench2_configuration.sls
@@ -23,7 +23,7 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
             - location /:
               - return: '301 https://$host$request_uri'
 

-      arvados_workbench2:
+      arvados_workbench2_ssl:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config:

diff --git a/test/salt/pillar/examples/nginx_workbench_configuration.sls b/test/salt/pillar/examples/nginx_workbench_configuration.sls
index a641bba94d3f05a307364524bfdf98dbf99692e4..5a394f535dda71b27e343d14e799ee843794b5e9 100644 (file)
--- a/test/salt/pillar/examples/nginx_workbench_configuration.sls
+++ b/test/salt/pillar/examples/nginx_workbench_configuration.sls
@@ -32,7 +32,7 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
             - location /:
               - return: '301 https://$host$request_uri'
 

-      arvados_workbench:
+      arvados_workbench_ssl:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config: