fix(config): prevent duplicated, undesired entries

diff --git a/arvados/defaults.yaml b/arvados/defaults.yaml
index a053b7f1ad6e98c2225c302f24397f823db31e8b..38aa764c8dabbe9cdcfa9361469fc268cab5e6c2 100644 (file)
--- 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 fe33a2a0e2cd6b89765d181b8f591c798a588f93..46923cd50f2b2e38cd5f3f8fa5fdf1ba48cb1b87 100644 (file)
--- 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/integration/workbench/controls/services_spec.rb b/test/integration/workbench/controls/services_spec.rb
index f4e6dd28035824778d07336a7e1b499e1c01be1b..15ae30f550a15631636d5019e01c02c7a3f35fa8 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'
 
-  describe service('ssh') do
+  describe service('nginx') do
     it { should be_enabled }
     it { should be_running }
   end