Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions server/config/development.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ tls:
keyData:
enableHostVerification: false
serverName:
uiServerTLS:
certFile:
keyFile:
codec:
endpoint:
passAccessToken: false
Expand Down
3 changes: 3 additions & 0 deletions server/config/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ tls:
keyData: {{ env "TEMPORAL_TLS_KEY_DATA" | default "" }}
enableHostVerification: {{ env "TEMPORAL_TLS_ENABLE_HOST_VERIFICATION" | default "false" }}
serverName: {{ env "TEMPORAL_TLS_SERVER_NAME" | default "" }}
uiServerTLS:
certFile: {{ env "TEMPORAL_UI_SERVER_TLS_CERT" | default "" }}
keyFile: {{ env "TEMPORAL_UI_SERVER_TLS_KEY" | default "" }}
auth:
enabled: {{ env "TEMPORAL_AUTH_ENABLED" | default "false" }}
providers:
Expand Down
7 changes: 7 additions & 0 deletions server/server/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ type (
// Forward specified HTTP headers from HTTP API requests to Temporal gRPC backend
ForwardHeaders []string `yaml:"forwardHeaders"`
HideLogs bool `yaml:"hideLogs"`
// TLS configuration options to start UI Server in TLS mode
UIServerTLS UIServerTLS `yaml:"uiServerTLS"`
}

CORS struct {
Expand All @@ -90,6 +92,11 @@ type (
ServerName string `yaml:"serverName"`
}

UIServerTLS struct {
CertFile string `yaml:"certFile"`
KeyFile string `yaml:"keyFile"`
}

Auth struct {
// Enabled - UI checks this first before reading your provider config
Enabled bool `yaml:"enabled"`
Expand Down
9 changes: 8 additions & 1 deletion server/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,14 @@ func (s *Server) Start() error {
}

address := fmt.Sprintf("%s:%d", cfg.Host, cfg.Port)
if err := s.httpServer.Start(address); err != http.ErrServerClosed {
if cfg.UIServerTLS.CertFile != "" && cfg.UIServerTLS.KeyFile != "" {
s.httpServer.Logger.Info("Starting UI server with TLS...")
err = s.httpServer.StartTLS(address, cfg.UIServerTLS.CertFile, cfg.UIServerTLS.KeyFile)
} else {
err = s.httpServer.Start(address)
}

if err != http.ErrServerClosed {
s.httpServer.Logger.Fatal(err)
}
return nil
Expand Down
Loading