Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Import additional secrets via file uri #25408

Merged
merged 4 commits into from
Jun 23, 2023
Merged

Import additional secrets via file uri #25408

merged 4 commits into from
Jun 23, 2023

Conversation

techknowlogick
Copy link
Member

@techknowlogick techknowlogick commented Jun 21, 2023 •
edited
Loading

Fixes #25034

@techknowlogick techknowlogick added the type/enhancement An improvement of existing functionality label Jun 21, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 21, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 21, 2023
@wxiaoguang
Copy link
Contributor

The error message in loadSecret could be updated together.

image

@techknowlogick techknowlogick marked this pull request as ready for review June 21, 2023 16:49
@techknowlogick
Copy link
Member Author

removed WIP as I've tested this now

@techknowlogick
Copy link
Member Author

The error message in loadSecret could be updated together.

@wxiaoguang thanks, I've updated the log message

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jun 22, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jun 22, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) June 22, 2023 23:47
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 22, 2023
@techknowlogick techknowlogick merged commit c0fc53e into go-gitea:main Jun 23, 2023
22 checks passed
@GiteaBot GiteaBot added this to the 1.21.0 milestone Jun 23, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 23, 2023
@techknowlogick techknowlogick deleted the fix-25034 branch June 23, 2023 04:17
@wxiaoguang
Copy link
Contributor

It seems that the app.ini and cheatsheet.md should also get updates, the old INTERNAL_TOKEN_URI and SECRET_KEY_URI were documented.

@wxiaoguang
Copy link
Contributor

ping~. does it need documentation?

@wxiaoguang wxiaoguang mentioned this pull request Jul 1, 2023
Merged
techknowlogick pushed a commit that referenced this pull request Jul 1, 2023
@wxiaoguang
Following-up improvments for various PRs (#25620)
cea9401 
For:

* #22743
* #25408
* #25412
* #25588
@wolfogre wolfogre mentioned this pull request Jul 25, 2023
Merged
techknowlogick pushed a commit that referenced this pull request Jul 25, 2023
@wolfogre
Fix loading LFS_JWT_SECRET from wrong section (#26109)
862f748 
Regression of #25408.

`LFS_JWT_SECRET_URI` and `LFS_JWT_SECRET` are under the `server`
section, not `lfs`.

So each time gitea restarts, it resets `LFS_JWT_SECRET`.

<img width="1378" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/527ec9b9-eea2-4334-a274-6d1471456edd">
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.

It should be possible to provide a file to LFS_JWT_SECRET
4 participants
@techknowlogick @wxiaoguang @delvh @GiteaBot