c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove getCaBundlePath

Browse Source
This commit is contained in:
Arturo Filastò 2019-05-15 19:25:23 +02:00
parent 9ad7c6507a
commit 9155ec95ae
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.goreleaser.yml
View File

@ -27,7 +27,7 @@ archive:
name_template: '{{ .Binary }}_{{.Version}}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ name_template: '{{ .Binary }}_{{.Version}}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{
.Arm }}{{ end }}' .Arm }}{{ end }}'
files: files:
- LICENCE.* - LICENSE.*
- Readme.* - Readme.*
snapshot: snapshot:
name_template: SNAPSHOT-{{ .Commit }} name_template: SNAPSHOT-{{ .Commit }}

15
nettests/nettests.go
View File

@ -52,14 +52,6 @@ type Controller struct {
inputIdxMap map[int64]int64 // Used to map mk idx to database id 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 // 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 // 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. // 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, OutputPath: msmtPath,
GeoIPCountryPath: geoIPCountryPath, GeoIPCountryPath: geoIPCountryPath,
GeoIPASNPath: geoIPASNPath, 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("GeoIPASNPath: %s", nt.Options.GeoIPASNPath)
log.Debugf("GeoIPCountryPath: %s", nt.Options.GeoIPCountryPath) log.Debugf("GeoIPCountryPath: %s", nt.Options.GeoIPCountryPath)