rdelaage
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 8a90b9b421 into 58a03e9fad

This commit is contained in:
yp05327 2024-05-19 14:53:46 +09:00 committed by GitHub
parent 58a03e9fad 8a90b9b421
commit 6e7dae3e35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
custom/conf/app.example.ini
View File

@ -260,6 +260,7 @@ RUN_USER = ; git
;;
;; ACME live directory (not to be confused with ACME directory URL: ACME_URL)
;; (Refer to caddy's ACME manager https://github.com/caddyserver/certmagic)
;; Relative paths will be resolved to `${AppDataPath}/${AcmeLiveDirectory}`
;ACME_DIRECTORY = https
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

3
modules/setting/server.go
View File

@ -205,6 +205,9 @@ func loadServerFrom(rootCfg ConfigProvider) {
deprecatedSetting(rootCfg, "server", "LETSENCRYPT_DIRECTORY", "server", "ACME_DIRECTORY", "v1.19.0")
AcmeLiveDirectory = sec.Key("LETSENCRYPT_DIRECTORY").MustString("https")
}
if !filepath.IsAbs(AcmeLiveDirectory) {
AcmeLiveDirectory = filepath.Join(AppDataPath, AcmeLiveDirectory)
}
if sec.HasKey("ACME_EMAIL") {
AcmeEmail = sec.Key("ACME_EMAIL").MustString("")