From 43c4afdb25124f31962bfd7dcd378d991fefd6f1 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 4 Jun 2024 16:01:37 +0200 Subject: [PATCH] packages/forgejo: rebase patchset --- patches/base/forgejo/oauth2-secret-from-env.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/base/forgejo/oauth2-secret-from-env.patch b/patches/base/forgejo/oauth2-secret-from-env.patch index aa8b5ca..809f359 100644 --- 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",