X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/42fff42165a0fa1602758a078746f8697f265f83..3961f5bd4349fca6769fd4263d2f7fbe54e8bcaa:/apps/workbench/config/arvados_config.rb diff --git a/apps/workbench/config/arvados_config.rb b/apps/workbench/config/arvados_config.rb index 007e8d0687..c5cc544b9b 100644 --- a/apps/workbench/config/arvados_config.rb +++ b/apps/workbench/config/arvados_config.rb @@ -31,19 +31,25 @@ clusterID, clusterConfig = confs["Clusters"].first $arvados_config_defaults = clusterConfig $arvados_config_defaults["ClusterID"] = clusterID -# Load the global config file -Open3.popen2("arvados-server", "config-dump", "-skip-legacy") do |stdin, stdout, status_thread| - confs = YAML.load(stdout, deserialize_symbols: false) - if confs && !confs.empty? - # config-dump merges defaults with user configuration, so every - # key should be set. - clusterID, clusterConfig = confs["Clusters"].first - $arvados_config_global = clusterConfig - $arvados_config_global["ClusterID"] = clusterID - else - # config-dump failed, assume we will be loading from legacy - # application.yml, initialize with defaults. - $arvados_config_global = $arvados_config_defaults.deep_dup +if ENV["ARVADOS_CONFIG"] == "none" + # Don't load config. This magic value is set by packaging scripts so + # they can run "rake assets:precompile" without a real config. + $arvados_config_global = $arvados_config_defaults.deep_dup +else + # Load the global config file + Open3.popen2("arvados-server", "config-dump", "-skip-legacy") do |stdin, stdout, status_thread| + confs = YAML.load(stdout, deserialize_symbols: false) + if confs && !confs.empty? + # config-dump merges defaults with user configuration, so every + # key should be set. + clusterID, clusterConfig = confs["Clusters"].first + $arvados_config_global = clusterConfig + $arvados_config_global["ClusterID"] = clusterID + else + # config-dump failed, assume we will be loading from legacy + # application.yml, initialize with defaults. + $arvados_config_global = $arvados_config_defaults.deep_dup + end end end @@ -189,7 +195,8 @@ ArvadosWorkbench::Application.configure do ConfigLoader.copy_into_config $arvados_config, config ConfigLoader.copy_into_config $remaining_config, config secrets.secret_key_base = $arvados_config["Workbench"]["SecretKeyBase"] - ConfigValidators.validate_wb2_url_config() - ConfigValidators.validate_download_config() - + if ENV["ARVADOS_CONFIG"] != "none" + ConfigValidators.validate_wb2_url_config() + ConfigValidators.validate_download_config() + end end