Skip to content

Commit 091bed0

Browse files
author
Julien Pivotto
authored
Make TLS config consistent with Prometheus (prometheus#1685)
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
1 parent fa4edd7 commit 091bed0

14 files changed

Lines changed: 57 additions & 55 deletions

https/README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@ If the config is kept within the https directory.
99
The config file should be written in YAML format, and is reloaded on each connection to check for new certificates and/or authentication policy.
1010

1111
## Sample Config
12+
1213
```
13-
tlsConfig :
14+
tls_config:
1415
# Certificate and key files for server to use to authenticate to client
15-
tlsCertPath : <filename>
16-
tlsKeyPath : <filename>
16+
cert_file: <filename>
17+
key_file: <filename>
1718
1819
# Server policy for client authentication. Maps to ClientAuth Policies
1920
# For more detail on clientAuth options: [ClientAuthType](https://golang.org/pkg/crypto/tls/#ClientAuthType)
20-
[ clientAuth : <string> | default = "NoClientCert" ]
21+
[ client_auth_type: <string> | default = "NoClientCert" ]
2122
2223
# CA certificate for client certificate authentication to the server
23-
[ clientCAs : <filename> ]
24+
[ client_ca_file: <filename> ]
2425
```
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tlsConfig :
2-
tlsCertPath : "testdata/server.crt"
3-
tlsKeyPath : "testdata/server.key"
4-
clientCAs : "somefile"
1+
tls_config :
2+
cert_file : "testdata/server.crt"
3+
key_file : "testdata/server.key"
4+
client_ca_file : "somefile"
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tlsConfig :
2-
tlsCertPath : "testdata/server.crt"
3-
tlsKeyPath : "testdata/server.key"
4-
clientAuth : "RequireAndVerifyClientCert"
1+
tls_config :
2+
cert_file : "testdata/server.crt"
3+
key_file : "testdata/server.key"
4+
client_auth_type : "RequireAndVerifyClientCert"
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tlsConfig :
2-
tlsCertPath : "testdata/server.crt"
3-
tlsKeyPath : "testdata/server.key"
4-
clientCAs : "testdata/tls-ca-chain.pem"
1+
tls_config :
2+
cert_file : "testdata/server.crt"
3+
key_file : "testdata/server.key"
4+
client_ca_file : "testdata/tls-ca-chain.pem"
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tlsConfig :
2-
tlsCertPath : "testdata/server.crt"
3-
tlsKeyPath : "testdata/server.key"
4-
clientAuth : "RequireAndVerifyClientCert"
5-
clientCAs: "testdata/tls-ca-chain.pem"
1+
tls_config :
2+
cert_file : "testdata/server.crt"
3+
key_file : "testdata/server.key"
4+
client_auth_type : "RequireAndVerifyClientCert"
5+
client_ca_file: "testdata/tls-ca-chain.pem"
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tlsConfig :
2-
tlsCertPath : "testdata/server.crt"
3-
tlsKeyPath : "testdata/server.key"
4-
clientAuth : "VerifyClientCertIfGiven"
5-
clientCAs : "testdata/tls-ca-chain.pem"
1+
tls_config :
2+
cert_file : "testdata/server.crt"
3+
key_file : "testdata/server.key"
4+
client_auth_type : "VerifyClientCertIfGiven"
5+
client_ca_file : "testdata/tls-ca-chain.pem"
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
tlsConfig :
2-
tlsCertPath : ""
3-
tlsKeyPath : "testdata/server.key"
1+
tls_config :
2+
cert_file : ""
3+
key_file : "testdata/server.key"
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
tlsConfig :
2-
tlsCertPath : "somefile"
3-
tlsKeyPath : "testdata/server.key"
1+
tls_config :
2+
cert_file : "somefile"
3+
key_file : "testdata/server.key"
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
tlsConfig :
2-
tlsCertPath : ""
3-
tlsKeyPath : ""
1+
tls_config :
2+
cert_file : ""
3+
key_file : ""
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
tlsConfig :
2-
tlsCertPath : "somefile"
3-
tlsKeyPath : "somefile"
1+
tls_config :
2+
cert_file : "somefile"
3+
key_file : "somefile"

0 commit comments

Comments
 (0)