From 897927690f5708d48f11dcd4f29358fbc98851bd Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 1 May 2019 22:32:06 -0400 Subject: [PATCH] Rename LFS_JWT_SECRET to include OAUTH2 as well (#6826) --- cmd/generate.go | 7 ++++--- docs/content/doc/usage/command-line.en-us.md | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/generate.go b/cmd/generate.go index e7071706e9..4e91b1d3f0 100644 --- a/cmd/generate.go +++ b/cmd/generate.go @@ -40,9 +40,10 @@ var ( } microcmdGenerateLfsJwtSecret = cli.Command{ - Name: "LFS_JWT_SECRET", - Usage: "Generate a new LFS_JWT_SECRET", - Action: runGenerateLfsJwtSecret, + Name: "JWT_SECRET", + Aliases: []string{"LFS_JWT_SECRET"}, + Usage: "Generate a new JWT_SECRET", + Action: runGenerateLfsJwtSecret, } microcmdGenerateSecretKey = cli.Command{ diff --git a/docs/content/doc/usage/command-line.en-us.md b/docs/content/doc/usage/command-line.en-us.md index 021283f9cc..9959ac30ab 100644 --- a/docs/content/doc/usage/command-line.en-us.md +++ b/docs/content/doc/usage/command-line.en-us.md @@ -161,11 +161,11 @@ for automatic deployments. - `secret`: - Options: - `INTERNAL_TOKEN`: Token used for an internal API call authentication. - - `LFS_JWT_SECRET`: LFS authentication secret. + - `JWT_SECRET`: LFS & OAUTH2 JWT authentication secret (LFS_JWT_SECRET is aliased to this option for backwards compatibility). - `SECRET_KEY`: Global secret key. - Examples: - `gitea generate secret INTERNAL_TOKEN` - - `gitea generate secret LFS_JWT_SECRET` + - `gitea generate secret JWT_SECRET` - `gitea generate secret SECRET_KEY` #### keys