X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ea3743e6f64672fa487ee55dba66c63cb9da0123..92d6698f3c2d1c8109a9cf08f25da408c3a7b442:/sdk/go/arvados/config.go?ds=sidebyside diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go index 698ee20d8c..60725fcd6d 100644 --- a/sdk/go/arvados/config.go +++ b/sdk/go/arvados/config.go @@ -159,11 +159,7 @@ type Cluster struct { KeepproxyPermission UploadDownloadRolePermissions WebDAVPermission UploadDownloadRolePermissions WebDAVLogEvents bool - } - Git struct { - GitCommand string - GitoliteHome string - Repositories string + WebDAVOutputBuffer ByteSize } Login struct { LDAP struct { @@ -247,7 +243,6 @@ type Cluster struct { AutoAdminFirstUser bool AutoAdminUserWithEmail string AutoSetupNewUsers bool - AutoSetupNewUsersWithRepository bool AutoSetupNewUsersWithVmUUID string AutoSetupUsernameBlacklist StringSet EmailSubjectPrefix string @@ -355,8 +350,6 @@ type Services struct { DispatchCloud Service DispatchLSF Service DispatchSLURM Service - GitHTTP Service - GitSSH Service Health Service Keepbalance Service Keepproxy Service @@ -510,21 +503,13 @@ type ContainersConfig struct { LocalKeepLogsToContainerLog string JobsAPI struct { - Enable string - GitInternalDir string + Enable string } Logging struct { - MaxAge Duration - SweepInterval Duration - LogBytesPerEvent int - LogSecondsBetweenEvents Duration - LogThrottlePeriod Duration - LogThrottleBytes int - LogThrottleLines int - LimitLogBytesPerJob int - LogPartialLineThrottlePeriod Duration - LogUpdatePeriod Duration - LogUpdateSize ByteSize + MaxAge Duration + SweepInterval Duration + LogUpdatePeriod Duration + LogUpdateSize ByteSize } ShellAccess struct { Admin bool @@ -534,15 +519,6 @@ type ContainersConfig struct { PrioritySpread int64 SbatchArgumentsList []string SbatchEnvironmentVariables map[string]string - Managed struct { - DNSServerConfDir string - DNSServerConfTemplate string - DNSServerReloadCommand string - DNSServerUpdateCommand string - ComputeNodeDomain string - ComputeNodeNameservers StringSet - AssignNodeHostname string - } } LSF struct { BsubSudoUser string @@ -669,7 +645,6 @@ const ( ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud" ServiceNameDispatchLSF ServiceName = "arvados-dispatch-lsf" ServiceNameDispatchSLURM ServiceName = "crunch-dispatch-slurm" - ServiceNameGitHTTP ServiceName = "arvados-git-httpd" ServiceNameHealth ServiceName = "arvados-health" ServiceNameKeepbalance ServiceName = "keep-balance" ServiceNameKeepproxy ServiceName = "keepproxy" @@ -689,7 +664,6 @@ func (svcs Services) Map() map[ServiceName]Service { ServiceNameDispatchCloud: svcs.DispatchCloud, ServiceNameDispatchLSF: svcs.DispatchLSF, ServiceNameDispatchSLURM: svcs.DispatchSLURM, - ServiceNameGitHTTP: svcs.GitHTTP, ServiceNameHealth: svcs.Health, ServiceNameKeepbalance: svcs.Keepbalance, ServiceNameKeepproxy: svcs.Keepproxy,