From 20333213ebfc97e2145da3cf9d3b96ed2d0fa7d9 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Sun, 11 Sep 2022 15:36:15 +0000 Subject: [PATCH 1/2] fix: Update embedded DERP server default name This is still configurable, but exposing the name DERP seemed awkward. --- cli/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/server.go b/cli/server.go index f1c654f9ac629..5b33f57585b48 100644 --- a/cli/server.go +++ b/cli/server.go @@ -756,7 +756,7 @@ func Server(newAPI func(*coderd.Options) *coderd.API) *cobra.Command { cliflag.BoolVarP(root.Flags(), &derpServerEnabled, "derp-server-enable", "", "CODER_DERP_SERVER_ENABLE", true, "Specifies whether to enable or disable the embedded DERP server.") cliflag.IntVarP(root.Flags(), &derpServerRegionID, "derp-server-region-id", "", "CODER_DERP_SERVER_REGION_ID", 999, "Specifies the region ID to use for the embedded DERP server.") cliflag.StringVarP(root.Flags(), &derpServerRegionCode, "derp-server-region-code", "", "CODER_DERP_SERVER_REGION_CODE", "coder", "Specifies the region code that is displayed in the Coder UI for the embedded DERP server.") - cliflag.StringVarP(root.Flags(), &derpServerRegionName, "derp-server-region-name", "", "CODER_DERP_SERVER_REGION_NAME", "Coder Embedded DERP", "Specifies the region name that is displayed in the Coder UI for the embedded DERP server.") + cliflag.StringVarP(root.Flags(), &derpServerRegionName, "derp-server-region-name", "", "CODER_DERP_SERVER_REGION_NAME", "Coder Relay", "Specifies the region name that is displayed in the Coder UI for the embedded DERP server.") cliflag.StringArrayVarP(root.Flags(), &derpServerSTUNAddrs, "derp-server-stun-addresses", "", "CODER_DERP_SERVER_STUN_ADDRESSES", []string{ "stun.l.google.com:19302", }, "Specify addresses for STUN servers to establish P2P connections. Set empty to disable P2P connections entirely.") From ae0d651fb3d7533a7f36c2417c9ce0b37e178c2b Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Sun, 11 Sep 2022 15:37:40 +0000 Subject: [PATCH 2/2] Update relay name --- cli/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/server.go b/cli/server.go index 5b33f57585b48..4ebee17d7e5cf 100644 --- a/cli/server.go +++ b/cli/server.go @@ -756,7 +756,7 @@ func Server(newAPI func(*coderd.Options) *coderd.API) *cobra.Command { cliflag.BoolVarP(root.Flags(), &derpServerEnabled, "derp-server-enable", "", "CODER_DERP_SERVER_ENABLE", true, "Specifies whether to enable or disable the embedded DERP server.") cliflag.IntVarP(root.Flags(), &derpServerRegionID, "derp-server-region-id", "", "CODER_DERP_SERVER_REGION_ID", 999, "Specifies the region ID to use for the embedded DERP server.") cliflag.StringVarP(root.Flags(), &derpServerRegionCode, "derp-server-region-code", "", "CODER_DERP_SERVER_REGION_CODE", "coder", "Specifies the region code that is displayed in the Coder UI for the embedded DERP server.") - cliflag.StringVarP(root.Flags(), &derpServerRegionName, "derp-server-region-name", "", "CODER_DERP_SERVER_REGION_NAME", "Coder Relay", "Specifies the region name that is displayed in the Coder UI for the embedded DERP server.") + cliflag.StringVarP(root.Flags(), &derpServerRegionName, "derp-server-region-name", "", "CODER_DERP_SERVER_REGION_NAME", "Coder Embedded Relay", "Specifies the region name that is displayed in the Coder UI for the embedded DERP server.") cliflag.StringArrayVarP(root.Flags(), &derpServerSTUNAddrs, "derp-server-stun-addresses", "", "CODER_DERP_SERVER_STUN_ADDRESSES", []string{ "stun.l.google.com:19302", }, "Specify addresses for STUN servers to establish P2P connections. Set empty to disable P2P connections entirely.")