aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2017-07-29 04:03:55 -0700
committerGravatar GitHub <noreply@github.com> 2017-07-29 04:03:55 -0700
commit9b805988f46f1b5688143f0a2d5835cf027c8d28 (patch)
tree39443bb9fdc6a96a6fa1205a4a45a01f24055599
parent64353d8f3b72dda433edaf529269427d56f5b337 (diff)
downloadcoredns-9b805988f46f1b5688143f0a2d5835cf027c8d28.tar.gz
coredns-9b805988f46f1b5688143f0a2d5835cf027c8d28.tar.zst
coredns-9b805988f46f1b5688143f0a2d5835cf027c8d28.zip
README.md: clean TLS cert language (#797)
Cleanup various READMEs to use the same naming scheme for certs, keys, and cacerts. Fixes #762
-rw-r--r--middleware/etcd/README.md2
-rw-r--r--middleware/kubernetes/README.md4
-rw-r--r--middleware/proxy/README.md10
3 files changed, 8 insertions, 8 deletions
diff --git a/middleware/etcd/README.md b/middleware/etcd/README.md
index 679e8a431..b2f4a05d0 100644
--- a/middleware/etcd/README.md
+++ b/middleware/etcd/README.md
@@ -26,7 +26,7 @@ etcd [ZONES...] {
path PATH
endpoint ENDPOINT...
upstream ADDRESS...
- tls CERT KEY CACERt
+ tls CERT KEY CACERT
debug
}
~~~
diff --git a/middleware/kubernetes/README.md b/middleware/kubernetes/README.md
index 7ee94ee1b..2ac5056ac 100644
--- a/middleware/kubernetes/README.md
+++ b/middleware/kubernetes/README.md
@@ -10,7 +10,7 @@ CoreDNS running the kubernetes middleware can be used as a replacement of kube-d
kubernetes ZONE [ZONE...] [{
[resyncperiod DURATION]
[endpoint URL
- [tls CERT-FILE KEY-FILE CACERT-FILE]]
+ [tls CERT KEY CACERT]]
[namespaces NAMESPACE [NAMESPACE...]]
[labels EXPRESSION]
[pods POD-MODE]
@@ -46,7 +46,7 @@ kubernetes ZONE [ZONE...] [{
}
```
-* `tls` **CERT-FILE KEY-FILE CACERT-FILE**
+* `tls` **CERT** **KEY** **CACERT**
The TLS cert, key and the CA cert file names for remote k8s connection. This option is ignored if connecting in-cluster (i.e. endpoint is not
specified).
diff --git a/middleware/proxy/README.md b/middleware/proxy/README.md
index 492a1e50c..1822e9711 100644
--- a/middleware/proxy/README.md
+++ b/middleware/proxy/README.md
@@ -27,7 +27,7 @@ proxy FROM TO... {
health_check PATH:PORT [DURATION]
except IGNORED_NAMES...
spray
- protocol [dns [force_tcp]|https_google [bootstrap ADDRESS...]|grpc [insecure|CA-PEM|KEY-PEM CERT-PEM|KEY-PEM CERT-PEM CA-PEM]]
+ protocol [dns [force_tcp]|https_google [bootstrap ADDRESS...]|grpc [insecure|CACERT|KEY CERT|KEY CERT CACERT]]
}
~~~
@@ -85,11 +85,11 @@ payload over HTTPS). Note that with `https_google` the entire transport is encry
* `grpc`: options are used to control how the TLS connection is made to the gRPC server.
* None - No client authentication is used, and the system CAs are used to verify the server certificate.
* `insecure` - TLS is not used, the connection is made in plaintext (not good in production).
- * CA-PEM - No client authentication is used, and the file CA-PEM is used to verify the server certificate.
- * KEY-PEM CERT-PEM - Client authentication is used with the specified key/cert pair. The server
+ * **CACERT** - No client authentication is used, and the file **CACERT** is used to verify the server certificate.
+ * **KEY** **CERT** - Client authentication is used with the specified key/cert pair. The server
certificate is verified with the system CAs.
- * KEY-PEM CERT-PEM CA-PEM - Client authentication is used with the specified key/cert pair. The
- server certificate is verified using the CA-PEM file.
+ * **KEY** **CERT** **CACERT** - Client authentication is used with the specified key/cert pair. The
+ server certificate is verified using the **CACERT** file.
An out-of-tree middleware that implements the server side of this can be found at
[here](https://github.com/infobloxopen/coredns-grpc).