loading up the forgejo repo on tangled to test page performance
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

fix acme renewal (#7409)

## Checklist

The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org).

### Tests

- I added test coverage for Go changes...
- [ ] in their respective `*_test.go` for unit tests.
- [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server.
- I added test coverage for JavaScript changes...
- [ ] in `web_src/js/*.test.js` if it can be unit tested.
- [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)).

### Documentation

- [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change.
- [x] I did not document these changes and I do not expect someone else to do it.

### Release notes

- [ ] I do not want this change to show in the release notes.
- [x] I want the title to show in the release notes with a link to this pull request.
- [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7409
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: Gwendolyn <me@gwendolyn.dev>
Co-committed-by: Gwendolyn <me@gwendolyn.dev>

authored by

Gwendolyn
Gwendolyn
and committed by
Earl Warren
08b2ec23 9d984fed

+9 -4
+9 -4
cmd/web_acme.go
··· 54 54 altTLSALPNPort = p 55 55 } 56 56 57 - magic := certmagic.NewDefault() 58 - magic.Storage = &certmagic.FileStorage{Path: setting.AcmeLiveDirectory} 57 + certmagic.Default.Storage = &certmagic.FileStorage{Path: setting.AcmeLiveDirectory} 58 + 59 59 // Try to use private CA root if provided, otherwise defaults to system's trust 60 60 var certPool *x509.CertPool 61 61 if setting.AcmeCARoot != "" { ··· 65 65 log.Warn("Failed to parse CA Root certificate, using default CA trust: %v", err) 66 66 } 67 67 } 68 - myACME := certmagic.NewACMEIssuer(magic, certmagic.ACMEIssuer{ 68 + 69 + certmagic.DefaultACME = certmagic.ACMEIssuer{ 69 70 CA: setting.AcmeURL, 70 71 TrustedRoots: certPool, 71 72 Email: setting.AcmeEmail, ··· 75 76 ListenHost: setting.HTTPAddr, 76 77 AltTLSALPNPort: altTLSALPNPort, 77 78 AltHTTPPort: altHTTPPort, 78 - }) 79 + } 80 + 81 + magic := certmagic.NewDefault() 82 + 83 + myACME := certmagic.NewACMEIssuer(magic, certmagic.DefaultACME) 79 84 80 85 magic.Issuers = []certmagic.Issuer{myACME} 81 86