Skip to content

Commit

Permalink
Allow login using multiple forges (woodpecker-ci#3822)
Browse files Browse the repository at this point in the history
  • Loading branch information
anbraten authored and 6543 committed Sep 5, 2024
1 parent 8d31700 commit e096866
Show file tree
Hide file tree
Showing 19 changed files with 1,182 additions and 97 deletions.
11 changes: 4 additions & 7 deletions cmd/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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")
Expand Down
44 changes: 22 additions & 22 deletions pipeline/rpc/proto/woodpecker.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e096866

Please sign in to comment.