Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-05-08 20:58:48 +02:00
Code Issues Projects Releases Wiki Activity

Allow SSL cert paths to be specified in config (#4910)

Browse source
This commit is contained in:
Flashy78 2024-06-10 20:11:41 -07:00 committed by GitHub
parent 62bdff351d
commit dcb86d9186
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
internal/manager/config/config.go
View file

@ -232,6 +232,9 @@ const (
SecurityTripwireAccessedFromPublicInternet = "security_tripwire_accessed_from_public_internet" SecurityTripwireAccessedFromPublicInternet = "security_tripwire_accessed_from_public_internet"
securityTripwireAccessedFromPublicInternetDefault = "" securityTripwireAccessedFromPublicInternetDefault = ""
sslCertPath = "ssl_cert_path"
sslKeyPath = "ssl_key_path"
// DLNA options // DLNA options
DLNAServerName = "dlna.server_name" DLNAServerName = "dlna.server_name"
DLNADefaultEnabled = "dlna.default_enabled" DLNADefaultEnabled = "dlna.default_enabled"
@ -356,8 +359,17 @@ func (i *Config) InitTLS() {
paths.GetStashHomeDirectory(), paths.GetStashHomeDirectory(),
} }
i.certFile = fsutil.FindInPaths(tlsPaths, "stash.crt") i.certFile = i.getString(sslCertPath)
i.keyFile = fsutil.FindInPaths(tlsPaths, "stash.key") if i.certFile == "" {
// Look for default file
i.certFile = fsutil.FindInPaths(tlsPaths, "stash.crt")
}
i.keyFile = i.getString(sslKeyPath)
if i.keyFile == "" {
// Look for default file
i.keyFile = fsutil.FindInPaths(tlsPaths, "stash.key")
}
} }
func (i *Config) GetTLSFiles() (certFile, keyFile string) { func (i *Config) GetTLSFiles() (certFile, keyFile string) {