Remove getCaBundlePath
This commit is contained in:
parent
9ad7c6507a
commit
9155ec95ae
|
@ -27,7 +27,7 @@ archive:
|
|||
name_template: '{{ .Binary }}_{{.Version}}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{
|
||||
.Arm }}{{ end }}'
|
||||
files:
|
||||
- LICENCE.*
|
||||
- LICENSE.*
|
||||
- Readme.*
|
||||
snapshot:
|
||||
name_template: SNAPSHOT-{{ .Commit }}
|
||||
|
|
|
@ -52,14 +52,6 @@ type Controller struct {
|
|||
inputIdxMap map[int64]int64 // Used to map mk idx to database id
|
||||
}
|
||||
|
||||
func getCaBundlePath() string {
|
||||
path := os.Getenv("SSL_CERT_FILE")
|
||||
if path != "" {
|
||||
return path
|
||||
}
|
||||
return "/etc/ssl/cert.pem"
|
||||
}
|
||||
|
||||
// SetInputIdxMap is used to set the mapping of index into input. This mapping
|
||||
// is used to reference, for example, a particular URL based on the index inside
|
||||
// of the input list and the index of it in the database.
|
||||
|
@ -114,8 +106,13 @@ func (c *Controller) Init(nt *mk.Nettest) error {
|
|||
OutputPath: msmtPath,
|
||||
GeoIPCountryPath: geoIPCountryPath,
|
||||
GeoIPASNPath: geoIPASNPath,
|
||||
CaBundlePath: caBundlePath,
|
||||
}
|
||||
|
||||
sslCertFile := os.Getenv("SSL_CERT_FILE")
|
||||
if sslCertFile != "" {
|
||||
nt.Options.CaBundlePath = sslCertFile
|
||||
}
|
||||
|
||||
log.Debugf("GeoIPASNPath: %s", nt.Options.GeoIPASNPath)
|
||||
log.Debugf("GeoIPCountryPath: %s", nt.Options.GeoIPCountryPath)
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user