github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-21 18:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow login using multiple forges (#3822)

Browse Source
This commit is contained in:
Anbraten
2024-07-13 10:41:35 +02:00
committed by GitHub
parent a26c7a475b
commit b12d676546
19 changed files with 1182 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/server/server.go
View File

@@ -265,13 +265,6 @@ func run(c *cli.Context) error {
}
func setupEvilGlobals(c *cli.Context, s store.Store) error {
// secrets
var err error
server.Config.Server.JWTSecret, err = setupJWTSecret(s)
if err != nil {
return fmt.Errorf("could not setup jwt secret: %w", err)
}
// services
server.Config.Services.Queue = setupQueue(c, s)
server.Config.Services.Logs = logging.New()
@@ -319,6 +312,10 @@ func setupEvilGlobals(c *cli.Context, s store.Store) error {
server.Config.Pipeline.Proxy.HTTPS = c.String("backend-https-proxy")
// server configuration
server.Config.Server.JWTSecret, err = setupJWTSecret(s)
if err != nil {
return fmt.Errorf("could not setup jwt secret: %w", err)
}
server.Config.Server.Cert = c.String("server-cert")
server.Config.Server.Key = c.String("server-key")
server.Config.Server.AgentToken = c.String("agent-secret")