From: Javier Bértoli <javier@netmanagers.com.ar>
Date: Fri, 16 Oct 2020 19:57:30 +0000 (-0300)
Subject: Merge pull request #6 from netmanagers/master
X-Git-Url: https://git.arvados.org/arvados-formula.git/commitdiff_plain/e7c928cfe2440560febe442928694171c8dcafa0?hp=dfbb7629fdc96155c04ffaaaf2dca7e6e004ca68

Merge pull request #6 from netmanagers/master

fix(config): prevent duplicated entries in some sections
---

diff --git a/arvados/defaults.yaml b/arvados/defaults.yaml
index a053b7f..38aa764 100644
--- a/arvados/defaults.yaml
+++ b/arvados/defaults.yaml
@@ -52,14 +52,6 @@ arvados:
       key: ''
       insecure: false
 
-    Login:
-      # Google:
-      #   ClientID: 94....apps.googleusercontent.com
-      #   ClientSecret: FL....r
-
-      PAM:
-        Enable: true
-
   ### THESE ARE THE PACKAGES AND DAEMONS BASIC CONFIGS
   ##### API
   api:
diff --git a/arvados/files/default/config.tmpl.jinja b/arvados/files/default/config.tmpl.jinja
index fe33a2a..46923cd 100644
--- a/arvados/files/default/config.tmpl.jinja
+++ b/arvados/files/default/config.tmpl.jinja
@@ -33,12 +33,6 @@ Clusters:
       {{ arvados.cluster.Collections | yaml(False) | indent(6) }}
     {%- endif %}
 
-    Login:
-      {{ arvados.cluster.Login | yaml(False) | indent(6) }}
-
-    Users:
-      {{ arvados.cluster.Users | yaml(False) | indent(6) }}
-
     TLS:
       Certificate: {{ arvados.cluster.tls.certificate | yaml_encode }}
       Key: {{ arvados.cluster.tls.key | yaml_encode }}
@@ -56,9 +50,11 @@ Clusters:
         'Containers',
         'Git',
         'InstanceTypes',
+        'Login',
         'Mail',
         'RemoteClusters',
         'SystemLogs',
+        'Users',
         'Volumes'
       ]
     %}
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: