Update to 2023-07-05 19:00

This commit is contained in:
Daniel Berteaud
2023-07-05 19:00:07 +02:00
parent 0cc589ae4b
commit 8471af248b
25 changed files with 254 additions and 161 deletions

View File

@@ -1,12 +1,5 @@
{% if consul_conf.tls.enabled and consul_conf.server %}
export CONSUL_HTTP_ADDR=https://localhost:{{ consul_services.https.port }}
export CONSUL_HTTP_SSL=true
export CONSUL_CACERT={{ consul_conf.tls.defaults.ca_file }}
{% if consul_vault_secrets.pki.enabled %}
export CONSUL_CLIENT_CERT={{ consul_root_dir }}/tls/cli.crt
export CONSUL_CLIENT_KEY={{ consul_root_dir }}/tls/cli.key
export CONSUL_TLS_SERVER_NAME=server.{{ consul_conf.datacenter | default('dc1') }}.{{ consul_conf.domain | default('consul') }}
{% endif %}
{% if consul_conf.server %}
export CONSUL_HTTP_ADDR=http://localhost:{{ consul_services.http.port }}
{% else %}
# TLS not enabled or not running in server mode
# not running in server mode
{% endif %}