Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

serverconfig: be consistent between low- and high-level config 

Use TLSCertFile and TLSKeyFile in both.
This commit is contained in:
Brad Fitzpatrick 2012-08-04 21:11:52 +10:00
parent 63418fe0fc
commit 42833a76e0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/serverconfig/genconfig.go
View File

@ -238,8 +238,8 @@ func GenLowLevelConfig(conf *Config) (lowLevelConf *Config, err error) {
secretRing = conf.RequiredString("identitySecretRing") secretRing = conf.RequiredString("identitySecretRing")
blobPath = conf.RequiredString("blobPath") blobPath = conf.RequiredString("blobPath")
tlsOn = conf.OptionalBool("TLS", false) tlsOn = conf.OptionalBool("TLS", false)
tlsCert = conf.OptionalString("TLSCert", "") tlsCert = conf.OptionalString("TLSCertFile", "")
tlsKey = conf.OptionalString("TLSKey", "") tlsKey = conf.OptionalString("TLSKeyFile", "")
dbname = conf.OptionalString("dbname", "") dbname = conf.OptionalString("dbname", "")
mysql = conf.OptionalString("mysql", "") mysql = conf.OptionalString("mysql", "")
mongo = conf.OptionalString("mongo", "") mongo = conf.OptionalString("mongo", "")

4
pkg/serverconfig/testdata/tls.json vendored
View File

@ -1,8 +1,8 @@
{ {
"listen": "1.2.3.4:443", "listen": "1.2.3.4:443",
"TLS": true, "TLS": true,
"TLSCert": "/tls.crt", "TLSCertFile": "/tls.crt",
"TLSKey": "/tls.key", "TLSKeyFile": "/tls.key",
"auth": "userpass:camlistore:pass3179", "auth": "userpass:camlistore:pass3179",
"blobPath": "/tmp/blobs", "blobPath": "/tmp/blobs",
"identity": "26F5ABDA", "identity": "26F5ABDA",