packages/forgejo: rebase patchset

2024-06-04 16:01:37 +02:00 · 2024-06-04 16:01:37 +02:00 · 43c4afdb25
commit 43c4afdb25
parent c3dc26b1bf
1 changed files with 7 additions and 7 deletions
--- a/patches/base/forgejo/oauth2-secret-from-env.patch
+++ b/patches/base/forgejo/oauth2-secret-from-env.patch
@ -1,12 +1,12 @@
-diff --git a/cmd/admin.go b/cmd/admin.go
-index f9fb1b6c6..2725b1f1c 100644
--- a/cmd/admin.go
-+++ b/cmd/admin.go
-@@ -151,6 +151,7 @@ var (
+diff --git a/cmd/admin_auth_oauth.go b/cmd/admin_auth_oauth.go
+index c151c0af27..e8a4f34707 100644
+--- a/cmd/admin_auth_oauth.go
+++ b/cmd/admin_auth_oauth.go
+@@ -34,6 +34,7 @@ var (
 			Name:  "secret",
 			Value: "",
 			Usage: "Client Secret",
-+			EnvVar: "FORGEJO_ADMIN_OAUTH2_SECRET",
+			EnvVars: []string{"FORGEJO_ADMIN_OAUTH2_SECRET"},
 		},
- 		cli.StringFlag{
+ 		&cli.StringFlag{
 			Name:  "auto-discover-url",