projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #13 from arvados/master
[arvados-formula.git]
/
arvados
/
defaults.yaml
diff --git
a/arvados/defaults.yaml
b/arvados/defaults.yaml
index a053b7f1ad6e98c2225c302f24397f823db31e8b..da441d0db388342eee3cff9f79d610d72d1ff5d7 100644
(file)
--- a/
arvados/defaults.yaml
+++ b/
arvados/defaults.yaml
@@
-12,6
+12,7
@@
arvados:
ruby:
manage_ruby: false
pkg: ruby
ruby:
manage_ruby: false
pkg: ruby
+ use_rvm: false
manage_gems_deps: false
gems_deps:
manage_gems_deps: false
gems_deps:
@@
-52,14
+53,6
@@
arvados:
key: ''
insecure: false
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:
### THESE ARE THE PACKAGES AND DAEMONS BASIC CONFIGS
##### API
api:
@@
-86,7
+79,7
@@
arvados:
# arvados-dispatch-cloud
# crunch-dispatch-slurm
service:
# arvados-dispatch-cloud
# crunch-dispatch-slurm
service:
- name:
''
+ name:
crunch-dispatch-local
port: ''
##### KEEPPROXY
keepproxy:
port: ''
##### KEEPPROXY
keepproxy:
@@
-148,6
+141,7
@@
arvados:
name: nginx
# just for reference, is where the upstream is configured
port: 9000
name: nginx
# just for reference, is where the upstream is configured
port: 9000
+
##### WORKBENCH2
workbench2:
pkg:
##### WORKBENCH2
workbench2:
pkg: