17750: Centos 7 needs rvm for api and workbench

[arvados-formula.git] / arvados / defaults.yaml

diff --git a/arvados/defaults.yaml b/arvados/defaults.yaml
index a053b7f1ad6e98c2225c302f24397f823db31e8b..ad9a0c51087ff29384aa631d018eabe4a8a7ac16 100644 (file)
--- a/arvados/defaults.yaml
+++ b/arvados/defaults.yaml
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 ---
 arvados:
   version: 'latest'
@@ -12,6 +15,9 @@ arvados:
   ruby:
     manage_ruby: false
     pkg: ruby
+    use_rvm: false
+    # Only used if using RVM
+    rvm_gemset: arvados
     manage_gems_deps: false
 
     gems_deps:
@@ -36,14 +42,13 @@ arvados:
     user: root
     group: root
     mode: 640
+    check_command: /usr/bin/arvados-server config-check -config
 
   # Experimental feature
   # only available when 'release: development'
   auto_reload_config: false
 
   cluster:
-    force_legacy_api14: false
-
     database:
       connection_pool_max: 32
 
@@ -52,13 +57,7 @@ arvados:
       key: ''
       insecure: false
 
-    Login:
-      # Google:
-      #   ClientID: 94....apps.googleusercontent.com
-      #   ClientSecret: FL....r
-
-      PAM:
-        Enable: true
+    resources: {}
 
   ### THESE ARE THE PACKAGES AND DAEMONS BASIC CONFIGS
   ##### API
@@ -86,7 +85,7 @@ arvados:
       # arvados-dispatch-cloud
       # crunch-dispatch-slurm
     service:
-      name: ''
+      name: crunch-dispatch-local
       port: ''
   ##### KEEPPROXY
   keepproxy:
@@ -123,10 +122,10 @@ arvados:
       name:
         - arvados-client
         - arvados-src
-        - libpam-arvados-go
         - python3-arvados-fuse
         - python3-arvados-python-client
         - python3-arvados-cwl-runner
+        - python3-crunchstat-summary
         - shellinabox
     gem:
       name:
@@ -137,8 +136,6 @@ arvados:
       service:
         name: shellinabox
         port: 4200
-    libpam_arvados:
-      config: /etc/pam.d/arvados
 
   ##### WORKBENCH
   workbench:
@@ -148,6 +145,7 @@ arvados:
       name: nginx
       # just for reference, is where the upstream is configured
       port: 9000
+
   ##### WORKBENCH2
   workbench2:
     pkg: