Update IPA to use getcert instead of ipa-getcert, as it includes more certificates.
This commit is contained in:
parent
7408990a6e
commit
fd78856c7b
@ -37,7 +37,7 @@ type Config struct {
|
|||||||
HTTPDPKIProxyConf string `fig:"httpd_pki_proxy_conf"`
|
HTTPDPKIProxyConf string `fig:"httpd_pki_proxy_conf"`
|
||||||
KInitBin string `fig:"kinit_bin"`
|
KInitBin string `fig:"kinit_bin"`
|
||||||
KListBin string `fig:"klist_bin"`
|
KListBin string `fig:"klist_bin"`
|
||||||
IPAGetCertBIN string `fig:"ipa_getcert_bin"`
|
GetCertBIN string `fig:"getcert_bin"`
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -167,7 +167,7 @@ func (a *App) ReadConfig() {
|
|||||||
HTTPDPKIProxyConf: "/etc/httpd/conf.d/ipa-pki-proxy.conf",
|
HTTPDPKIProxyConf: "/etc/httpd/conf.d/ipa-pki-proxy.conf",
|
||||||
KInitBin: "/usr/bin/kinit",
|
KInitBin: "/usr/bin/kinit",
|
||||||
KListBin: "/usr/bin/klist",
|
KListBin: "/usr/bin/klist",
|
||||||
IPAGetCertBIN: "/usr/bin/ipa-getcert",
|
GetCertBIN: "/usr/bin/getcert",
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load configuration.
|
// Load configuration.
|
||||||
|
@ -200,8 +200,8 @@ func (e *FreeIPAExporter) certMongerCerts() ([]*CertMongerCerts, error) {
|
|||||||
requestRX := regexp.MustCompile(`Request ID '([A-Za-z0-9]+)':`)
|
requestRX := regexp.MustCompile(`Request ID '([A-Za-z0-9]+)':`)
|
||||||
keyValueRX := regexp.MustCompile(`\s([A-Za-z][A-Za-z- ]+): (.*)$`)
|
keyValueRX := regexp.MustCompile(`\s([A-Za-z][A-Za-z- ]+): (.*)$`)
|
||||||
|
|
||||||
// Setup the ipa-getcert list command.
|
// Setup the getcert list command.
|
||||||
cmd := exec.Command(app.config.IPAGetCertBIN, "list")
|
cmd := exec.Command(app.config.GetCertBIN, "list")
|
||||||
|
|
||||||
// Get the pipes.
|
// Get the pipes.
|
||||||
stdout, err := cmd.StdoutPipe()
|
stdout, err := cmd.StdoutPipe()
|
||||||
|
2
main.go
2
main.go
@ -15,7 +15,7 @@ import (
|
|||||||
const (
|
const (
|
||||||
serviceName = "freeipa-health-metrics"
|
serviceName = "freeipa-health-metrics"
|
||||||
serviceDescription = "Provides metrics of FreeIPA's health"
|
serviceDescription = "Provides metrics of FreeIPA's health"
|
||||||
serviceVersion = "0.1"
|
serviceVersion = "0.4"
|
||||||
namespace = "freeipa"
|
namespace = "freeipa"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -27,4 +27,4 @@ pki_tomcat_server_xml: test/server.xml
|
|||||||
httpd_pki_proxy_conf: test/ipa-pki-proxy.conf
|
httpd_pki_proxy_conf: test/ipa-pki-proxy.conf
|
||||||
kinit_bin: test/kinit
|
kinit_bin: test/kinit
|
||||||
klist_bin: test/klist
|
klist_bin: test/klist
|
||||||
ipa_getcert_bin: test/ipa-getcert
|
getcert_bin: test/getcert
|
||||||
|
Loading…
Reference in New Issue
Block a user