From b0624be0a99d6d8266deb938f70e49cd86b84a87 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Fri, 24 Jun 2022 11:15:20 +0200 Subject: [PATCH] Move etcd configuration to common section. --- proxy.conf.in | 30 +++++++++++++++--------------- server.conf.in | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/proxy.conf.in b/proxy.conf.in index c978939..ac17412 100644 --- a/proxy.conf.in +++ b/proxy.conf.in @@ -26,21 +26,6 @@ tokentype = static #server1 = pubkey1.pem #server2 = pubkey2.pem -# For token type "etcd": Comma-separated list of static etcd endpoints to -# connect to. -#endpoints = 127.0.0.1:2379,127.0.0.1:22379,127.0.0.1:32379 - -# For token type "etcd": Options to perform endpoint discovery through DNS SRV. -# Only used if no endpoints are configured manually. -#discoverysrv = example.com -#discoveryservice = foo - -# For token type "etcd": Path to private key, client certificate and CA -# certificate if TLS authentication should be used. -#clientkey = /path/to/etcd-client.key -#clientcert = /path/to/etcd-client.crt -#cacert = /path/to/etcd-ca.crt - # For token type "etcd": Format of key name to retrieve the public key from, # "%s" will be replaced with the token id. Multiple possible formats can be # comma-separated. @@ -65,3 +50,18 @@ url = ws://localhost:8188/ # Comma-separated list of IP addresses that are allowed to access the stats # endpoint. Leave empty (or commented) to only allow access from "127.0.0.1". #allowed_ips = + +[etcd] +# Comma-separated list of static etcd endpoints to connect to. +#endpoints = 127.0.0.1:2379,127.0.0.1:22379,127.0.0.1:32379 + +# Options to perform endpoint discovery through DNS SRV. +# Only used if no endpoints are configured manually. +#discoverysrv = example.com +#discoveryservice = foo + +# Path to private key, client certificate and CA certificate if TLS +# authentication should be used. +#clientkey = /path/to/etcd-client.key +#clientcert = /path/to/etcd-client.crt +#cacert = /path/to/etcd-ca.crt diff --git a/server.conf.in b/server.conf.in index 9125b6c..f06b475 100644 --- a/server.conf.in +++ b/server.conf.in @@ -165,21 +165,6 @@ connectionsperhost = 8 # or deleted as necessary. #dnsdiscovery = true -# For url type "etcd": Comma-separated list of static etcd endpoints to -# connect to. -#endpoints = 127.0.0.1:2379,127.0.0.1:22379,127.0.0.1:32379 - -# For url type "etcd": Options to perform endpoint discovery through DNS SRV. -# Only used if no endpoints are configured manually. -#discoverysrv = example.com -#discoveryservice = foo - -# For url type "etcd": Path to private key, client certificate and CA -# certificate if TLS authentication should be used. -#clientkey = /path/to/etcd-client.key -#clientcert = /path/to/etcd-client.crt -#cacert = /path/to/etcd-ca.crt - # For url type "etcd": Key prefix of MCU proxy entries. All keys below will be # watched and assumed to contain a JSON document. The entry "address" from this # document will be used as proxy URL, other contents in the document will be @@ -234,3 +219,18 @@ connectionsperhost = 8 # Comma-separated list of IP addresses that are allowed to access the stats # endpoint. Leave empty (or commented) to only allow access from "127.0.0.1". #allowed_ips = + +[etcd] +# Comma-separated list of static etcd endpoints to connect to. +#endpoints = 127.0.0.1:2379,127.0.0.1:22379,127.0.0.1:32379 + +# Options to perform endpoint discovery through DNS SRV. +# Only used if no endpoints are configured manually. +#discoverysrv = example.com +#discoveryservice = foo + +# Path to private key, client certificate and CA certificate if TLS +# authentication should be used. +#clientkey = /path/to/etcd-client.key +#clientcert = /path/to/etcd-client.crt +#cacert = /path/to/etcd-ca.crt