mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-02-01 20:22:21 +00:00
Remove WOODPECKER_DEV_OAUTH_HOST
and WOODPECKER_DEV_GITEA_OAUTH_URL
(#3961)
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
This commit is contained in:
parent
3a4ffe951e
commit
659e925d0e
3 changed files with 3 additions and 15 deletions
|
@ -378,7 +378,7 @@ var flags = append([]cli.Flag{
|
|||
"WOODPECKER_BITBUCKET_SKIP_VERIFY"),
|
||||
},
|
||||
&cli.StringFlag{
|
||||
Sources: cli.EnvVars("WOODPECKER_EXPERT_FORGE_OAUTH_HOST", "WOODPECKER_DEV_GITEA_OAUTH_URL"), // TODO: remove WOODPECKER_DEV_GITEA_OAUTH_URL in next major release
|
||||
Sources: cli.EnvVars("WOODPECKER_EXPERT_FORGE_OAUTH_HOST"),
|
||||
Name: "forge-oauth-host",
|
||||
Usage: "!!!for experts!!! fully qualified public forge url. Use it if your forge url WOODPECKER_FORGE_URL or WOODPECKER_GITEA_URL, ... isn't a public url. Format: <scheme>://<host>[/<prefix path>]",
|
||||
},
|
||||
|
@ -481,14 +481,6 @@ var flags = append([]cli.Flag{
|
|||
Name: "server-webhook-host",
|
||||
Usage: "!!!for experts!!! fully qualified woodpecker server url called by forge's webhooks. Format: <scheme>://<host>[/<prefix path>]",
|
||||
},
|
||||
// TODO: remove in next major release
|
||||
&cli.StringFlag{
|
||||
Sources: cli.EnvVars("WOODPECKER_DEV_OAUTH_HOST"),
|
||||
Name: "server-dev-oauth-host-deprecated",
|
||||
Usage: "DEPRECATED: use WOODPECKER_EXPERT_FORGE_OAUTH_HOST instead\nfully qualified url used for oauth redirects. Format: <scheme>://<host>[/<prefix path>]",
|
||||
Value: "",
|
||||
Hidden: true,
|
||||
},
|
||||
//
|
||||
// secrets encryption in DB
|
||||
//
|
||||
|
|
|
@ -206,11 +206,7 @@ func setupEvilGlobals(ctx context.Context, c *cli.Command, s store.Store) error
|
|||
} else {
|
||||
server.Config.Server.WebhookHost = serverHost
|
||||
}
|
||||
if c.IsSet("server-dev-oauth-host-deprecated") {
|
||||
server.Config.Server.OAuthHost = c.String("server-dev-oauth-host-deprecated")
|
||||
} else {
|
||||
server.Config.Server.OAuthHost = serverHost
|
||||
}
|
||||
server.Config.Server.OAuthHost = serverHost
|
||||
server.Config.Server.Port = c.String("server-addr")
|
||||
server.Config.Server.PortTLS = c.String("server-addr-tls")
|
||||
server.Config.Server.StatusContext = c.String("status-context")
|
||||
|
|
|
@ -11,6 +11,7 @@ Some versions need some changes to the server configuration or the pipeline conf
|
|||
|
||||
## `next`
|
||||
|
||||
- Removed `WOODPECKER_DEV_OAUTH_HOST` and `WOODPECKER_DEV_GITEA_OAUTH_URL` use `WOODPECKER_EXPERT_FORGE_OAUTH_HOST`
|
||||
- Compatibility mode of deprecated `pipeline:`, `platform:` and `branches:` pipeline config options are now removed and pipeline will now fail if still in use.
|
||||
- Deprecated `steps.[name].group` in favor of `steps.[name].depends_on` (see [workflow syntax](./20-usage/20-workflow-syntax.md#depends_on) to learn how to set dependencies)
|
||||
- Removed `WOODPECKER_ROOT_PATH` and `WOODPECKER_ROOT_URL` config variables. Use `WOODPECKER_HOST` with a path instead
|
||||
|
@ -20,7 +21,6 @@ Some versions need some changes to the server configuration or the pipeline conf
|
|||
- Deprecated alternative names for secrets, use `environment` with `from_secret`
|
||||
- Deprecated slice definition for env vars
|
||||
- Deprecated `environment` filter, use `when.evaluate`
|
||||
- Use `WOODPECKER_EXPERT_FORGE_OAUTH_HOST` instead of `WOODPECKER_DEV_GITEA_OAUTH_URL` or `WOODPECKER_DEV_OAUTH_HOST`
|
||||
- Deprecated `WOODPECKER_WEBHOOK_HOST` in favor of `WOODPECKER_EXPERT_WEBHOOK_HOST`
|
||||
|
||||
## 2.0.0
|
||||
|
|
Loading…
Reference in a new issue