Update to 2022-09-04 14:00

This commit is contained in:
Daniel Berteaud
2022-09-04 14:00:17 +02:00
parent 59c5adc8fa
commit c36a80b596
16 changed files with 270 additions and 10 deletions

View File

@@ -109,13 +109,6 @@
notify: restart nomad
tags: nomad
- name: Install backup hooks
template: src={{ item }}-backup.j2 dest=/etc/backup/{{ item }}.d/nomad mode=755
loop:
- pre
- post
tags: nomad
- name: Install consul-template unit
template: src=consul-template-nomad.service.j2 dest=/etc/systemd/system/consul-template-nomad.service
register: nomad_consul_tpl_unit

View File

@@ -4,7 +4,7 @@ export NOMAD_CACERT={{ nomad_conf.tls.ca_file }}
{% if nomad_vault_tls.enabled %}
export NOMAD_CLIENT_CERT={{ nomad_root_dir }}/tls/cli.crt
export NOMAD_CLIENT_KEY={{ nomad_root_dir }}/tls/cli.key
export NOMAD_TLS_SERVER_NAME=server.{{ nomad_conf.region }}.nomad
export NOMAD_TLS_SERVER_NAME=server.{{ nomad_conf.region | default('global') }}.nomad
{% endif %}
{% else %}
# TLS not enabled or not running in server mode