X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3fa0a5500d5b58b5d0b9ea940dac85be2da079ec..b68d2d12f4dff73d371297688d84f32289c06907:/services/api/config/arvados_config.rb diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb index 2c259919ae..d928d592c9 100644 --- a/services/api/config/arvados_config.rb +++ b/services/api/config/arvados_config.rb @@ -28,24 +28,9 @@ rescue LoadError # configured by application.yml (i.e., here!) instead. end -if (File.exist?(File.expand_path '../omniauth.rb', __FILE__) and - not defined? WARNED_OMNIAUTH_CONFIG) - Rails.logger.warn <<-EOS -DEPRECATED CONFIGURATION: - Please move your SSO provider config into config/application.yml - and delete config/initializers/omniauth.rb. -EOS - # Real values will be copied from globals by omniauth_init.rb. For - # now, assign some strings so the generic *.yml config loader - # doesn't overwrite them or complain that they're missing. - Rails.configuration.Login["SSO"]["ProviderAppID"] = 'xxx' - Rails.configuration.Login["SSO"]["ProviderAppSecret"] = 'xxx' - Rails.configuration.Services["SSO"]["ExternalURL"] = '//xxx' - WARNED_OMNIAUTH_CONFIG = true -end - # Load the defaults, used by config:migrate and fallback loading # legacy application.yml +load_time = Time.now.utc defaultYAML, stderr, status = Open3.capture3("arvados-server", "config-dump", "-config=-", "-skip-legacy", stdin_data: "Clusters: {xxxxx: {}}") if !status.success? puts stderr @@ -55,6 +40,8 @@ confs = YAML.load(defaultYAML, deserialize_symbols: false) clusterID, clusterConfig = confs["Clusters"].first $arvados_config_defaults = clusterConfig $arvados_config_defaults["ClusterID"] = clusterID +$arvados_config_defaults["SourceTimestamp"] = Time.rfc3339(confs["SourceTimestamp"]) +$arvados_config_defaults["SourceSHA256"] = confs["SourceSHA256"] if ENV["ARVADOS_CONFIG"] == "none" # Don't load config. This magic value is set by packaging scripts so @@ -70,6 +57,8 @@ else clusterID, clusterConfig = confs["Clusters"].first $arvados_config_global = clusterConfig $arvados_config_global["ClusterID"] = clusterID + $arvados_config_global["SourceTimestamp"] = Time.rfc3339(confs["SourceTimestamp"]) + $arvados_config_global["SourceSHA256"] = confs["SourceSHA256"] else # config-dump failed, assume we will be loading from legacy # application.yml, initialize with defaults. @@ -80,6 +69,7 @@ end # Now make a copy $arvados_config = $arvados_config_global.deep_dup +$arvados_config["LoadTimestamp"] = load_time def arrayToHash cfg, k, v val = {} @@ -100,6 +90,7 @@ arvcfg.declare_config "API.MaxRequestSize", Integer, :max_request_size arvcfg.declare_config "API.MaxIndexDatabaseRead", Integer, :max_index_database_read arvcfg.declare_config "API.MaxItemsPerResponse", Integer, :max_items_per_response arvcfg.declare_config "API.MaxTokenLifetime", ActiveSupport::Duration +arvcfg.declare_config "API.RequestTimeout", ActiveSupport::Duration arvcfg.declare_config "API.AsyncPermissionsUpdateInterval", ActiveSupport::Duration, :async_permissions_update_interval arvcfg.declare_config "Users.AutoSetupNewUsers", Boolean, :auto_setup_new_users arvcfg.declare_config "Users.AutoSetupNewUsersWithVmUUID", String, :auto_setup_new_users_with_vm_uuid @@ -112,16 +103,16 @@ arvcfg.declare_config "Users.UserProfileNotificationAddress", String, :user_prof arvcfg.declare_config "Users.AdminNotifierEmailFrom", String, :admin_notifier_email_from arvcfg.declare_config "Users.EmailSubjectPrefix", String, :email_subject_prefix arvcfg.declare_config "Users.UserNotifierEmailFrom", String, :user_notifier_email_from +arvcfg.declare_config "Users.UserNotifierEmailBcc", Hash arvcfg.declare_config "Users.NewUserNotificationRecipients", Hash, :new_user_notification_recipients, ->(cfg, k, v) { arrayToHash cfg, "Users.NewUserNotificationRecipients", v } arvcfg.declare_config "Users.NewInactiveUserNotificationRecipients", Hash, :new_inactive_user_notification_recipients, method(:arrayToHash) -arvcfg.declare_config "Login.SSO.ProviderAppSecret", String, :sso_app_secret -arvcfg.declare_config "Login.SSO.ProviderAppID", String, :sso_app_id +arvcfg.declare_config "Users.CanCreateRoleGroups", Boolean +arvcfg.declare_config "Users.RoleGroupsVisibleToAll", Boolean arvcfg.declare_config "Login.LoginCluster", String arvcfg.declare_config "Login.TrustedClients", Hash arvcfg.declare_config "Login.RemoteTokenRefresh", ActiveSupport::Duration arvcfg.declare_config "Login.TokenLifetime", ActiveSupport::Duration arvcfg.declare_config "TLS.Insecure", Boolean, :sso_insecure -arvcfg.declare_config "Services.SSO.ExternalURL", String, :sso_provider_url arvcfg.declare_config "AuditLogs.MaxAge", ActiveSupport::Duration, :max_audit_log_age arvcfg.declare_config "AuditLogs.MaxDeleteBatch", Integer, :max_audit_log_delete_batch arvcfg.declare_config "AuditLogs.UnloggedAttributes", Hash, :unlogged_attributes, ->(cfg, k, v) { arrayToHash cfg, "AuditLogs.UnloggedAttributes", v } @@ -140,8 +131,7 @@ arvcfg.declare_config "Containers.LogReuseDecisions", Boolean, :log_reuse_decisi arvcfg.declare_config "Containers.DefaultKeepCacheRAM", Integer, :container_default_keep_cache_ram arvcfg.declare_config "Containers.MaxDispatchAttempts", Integer, :max_container_dispatch_attempts arvcfg.declare_config "Containers.MaxRetryAttempts", Integer, :container_count_max -arvcfg.declare_config "Containers.UsePreemptibleInstances", Boolean, :preemptible_instances -arvcfg.declare_config "Containers.MaxComputeVMs", Integer, :max_compute_nodes +arvcfg.declare_config "Containers.AlwaysUsePreemptibleInstances", Boolean, :preemptible_instances arvcfg.declare_config "Containers.Logging.LogBytesPerEvent", Integer, :crunch_log_bytes_per_event arvcfg.declare_config "Containers.Logging.LogSecondsBetweenEvents", ActiveSupport::Duration, :crunch_log_seconds_between_events arvcfg.declare_config "Containers.Logging.LogThrottlePeriod", ActiveSupport::Duration, :crunch_log_throttle_period @@ -189,6 +179,7 @@ arvcfg.declare_config "RemoteClusters", Hash, :remote_hosts, ->(cfg, k, v) { ConfigLoader.set_cfg cfg, "RemoteClusters", h } arvcfg.declare_config "RemoteClusters.*.Proxy", Boolean, :remote_hosts_via_dns +arvcfg.declare_config "StorageClasses", Hash dbcfg = ConfigLoader.new @@ -256,6 +247,17 @@ if $arvados_config["Collections"]["DefaultTrashLifetime"] < 86400.seconds then raise "default_trash_lifetime is %d, must be at least 86400" % Rails.configuration.Collections.DefaultTrashLifetime end +default_storage_classes = [] +$arvados_config["StorageClasses"].each do |cls, cfg| + if cfg["Default"] + default_storage_classes << cls + end +end +if default_storage_classes.length == 0 + default_storage_classes = ["default"] +end +$arvados_config["DefaultStorageClasses"] = default_storage_classes.sort + # # Special case for test database where there's no database.yml, # because the Arvados config.yml doesn't have a concept of multiple