From 73a0b42b03c3a8c247712ce5e64b7215686e9cef Mon Sep 17 00:00:00 2001
From: =?utf8?q?Javier=20B=C3=A9rtoli?= <javier@netmanagers.com.ar>
Date: Thu, 15 Oct 2020 19:50:32 -0300
Subject: [PATCH] docs(examples): improve consistency in naming

---
 test/integration/workbench/controls/services_spec.rb         | 2 +-
 test/salt/pillar/examples/nginx_controller_configuration.sls | 2 +-
 test/salt/pillar/examples/nginx_keepproxy_configuration.sls  | 4 ++--
 test/salt/pillar/examples/nginx_keepweb_configuration.sls    | 4 ++--
 test/salt/pillar/examples/nginx_webshell_configuration.sls   | 4 ++--
 test/salt/pillar/examples/nginx_websocket_configuration.sls  | 4 ++--
 test/salt/pillar/examples/nginx_workbench2_configuration.sls | 2 +-
 test/salt/pillar/examples/nginx_workbench_configuration.sls  | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/integration/workbench/controls/services_spec.rb b/test/integration/workbench/controls/services_spec.rb
index 15ae30f..f4e6dd2 100644
--- 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'
 
-  describe service('nginx') do
+  describe service('ssh') do
     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 43701f3..20e9445 100644
--- 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'
 
-      arvados_controller:
+      arvados_controller_ssl:
         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 2485b37..41871c8 100644
--- 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
-      arvados_keep_default:
+      arvados_keepproxy_default:
         enabled: true
         overwrite: true
         config:
@@ -25,7 +25,7 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
-      arvados_keepproxy:
+      arvados_keepproxy_default:
         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 cbc4aef..6547e82 100644
--- 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
-      arvados_collections_default:
+      arvados_collections_download_default:
         enabled: true
         overwrite: true
         config:
@@ -26,7 +26,7 @@ nginx:
               - return: '301 https://$host$request_uri'
 
       ### COLLECTIONS / DOWNLOAD
-      arvados_collections_downloads:
+      arvados_collections_download_ssl:
         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 33f3dfd..4a59cc5 100644
--- 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:
-      arvados_webshell:
+      arvados_webshell_default:
         enabled: true
         overwrite: true
         config:
@@ -26,7 +26,7 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
-      arvados_webshell-ssl:
+      arvados_webshell_ssl:
         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 01b7788..d7e75c9 100644
--- 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
-      arvados_ws_default:
+      arvados_websocket_default:
         enabled: true
         overwrite: true
         config:
@@ -25,7 +25,7 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
-      arvados_websocket:
+      arvados_websocket_ssl:
         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 9c2e0fa..f8946f4 100644
--- 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'
 
-      arvados_workbench2:
+      arvados_workbench2_ssl:
         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 a641bba..5a394f5 100644
--- 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'
 
-      arvados_workbench:
+      arvados_workbench_ssl:
         enabled: true
         overwrite: true
         config:
-- 
2.30.2