relay

f0ssel · f0ssel · commit 6410c28e976f · 2022-10-18T01:50:07.000Z
diff --git a/cli/deployment/config.go b/cli/deployment/config.go
diff --git a/codersdk/config.go b/codersdk/config.go
@@ -121,6 +121,10 @@ type DERPServerConfig struct {
 	// Flag:    derp-server-stun-addresses
 	// Default: []string{"stun.l.google.com:19302"}
 	STUNAddresses []string `mapstructure:"stun_address"`
+	// Usage:       An HTTP address that is accessible by other replicas to relay DERP traffic. Required for high availability.
+	// Flag:        derp-server-relay-address
+	// Enterprise:  true
+	RelayAddress string `mapstructure:"relay_address"`
 }
 
 type DERPConfigConfig struct {
diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go
@@ -29,8 +29,8 @@ func server() *cobra.Command {
 			return nil, nil, xerrors.Errorf("failed to read config: %w", err)
 		}
 
-		if cfg.DerpServerRelayAddress != "" {
-			_, err := url.Parse(cfg.DerpServerRelayAddress)
+		if cfg.DERP.Server.RelayAddress != "" {
+			_, err := url.Parse(cfg.DERP.Server.RelayAddress)
 			if err != nil {
 				return nil, nil, xerrors.Errorf("derp-server-relay-address must be a valid HTTP URL: %w", err)
 			}
@@ -59,8 +59,8 @@ func server() *cobra.Command {
 			SCIMAPIKey:             []byte(options.DeploymentConfig.SCIMAuthHeader),
 			UserWorkspaceQuota:     options.DeploymentConfig.UserWorkspaceQuota,
 			RBAC:                   true,
-			DERPServerRelayAddress: options.DeploymentConfig.DerpServerRelayAddress,
-			DERPServerRegionID:     options.DeploymentConfig.DerpServerRegionID,
+			DERPServerRelayAddress: options.DeploymentConfig.DERP.Server.RelayAddress,
+			DERPServerRegionID:     options.DeploymentConfig.DERP.Server.RegionID,
 
 			Options: options,
 		}

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ func server() *cobra.Command {`
`29`	`29`	`return nil, nil, xerrors.Errorf("failed to read config: %w", err)`
`30`	`30`	`}`
`31`	`31`
`32`		`- if cfg.DerpServerRelayAddress != "" {`
`33`		`- _, err := url.Parse(cfg.DerpServerRelayAddress)`
	`32`	`+ if cfg.DERP.Server.RelayAddress != "" {`
	`33`	`+ _, err := url.Parse(cfg.DERP.Server.RelayAddress)`
`34`	`34`	`if err != nil {`
`35`	`35`	`return nil, nil, xerrors.Errorf("derp-server-relay-address must be a valid HTTP URL: %w", err)`
`36`	`36`	`}`
`@@ -59,8 +59,8 @@ func server() *cobra.Command {`
`59`	`59`	`SCIMAPIKey: []byte(options.DeploymentConfig.SCIMAuthHeader),`
`60`	`60`	`UserWorkspaceQuota: options.DeploymentConfig.UserWorkspaceQuota,`
`61`	`61`	`RBAC: true,`
`62`		`- DERPServerRelayAddress: options.DeploymentConfig.DerpServerRelayAddress,`
`63`		`- DERPServerRegionID: options.DeploymentConfig.DerpServerRegionID,`
	`62`	`+ DERPServerRelayAddress: options.DeploymentConfig.DERP.Server.RelayAddress,`
	`63`	`+ DERPServerRegionID: options.DeploymentConfig.DERP.Server.RegionID,`
`64`	`64`
`65`	`65`	`Options: options,`
`66`	`66`	`}`