jpp/ansible-roles
1
0
Fork 0
mirror of https://git.lapiole.org/dani/ansible-roles.git synced 2025-11-01 11:21:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2022-09-04 01:00

Browse Source
This commit is contained in:
Daniel Berteaud
2022-09-04 01:00:25 +02:00
parent 6c02758759
commit 59c5adc8fa
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/nomad/templates/consul-template.hcl.j2
View File

@@ -35,8 +35,10 @@ template {
exec {
command = "systemctl reload nomad"
}
}
{% if nomad_conf.server.enabled %}
template {
source = "{{ nomad_root_dir }}/consul-template/cli.crt.tpl"
left_delimiter = "[["
@@ -51,4 +53,4 @@ template {
destination = "{{ nomad_root_dir }}/tls/cli.key"
perms = 0640
}
{% endif %}

6
roles/nomad/templates/profile.sh.j2
View File

@@ -1,9 +1,11 @@
{% if nomad_conf.tls.http %}
{% if nomad_conf.tls.http and nomad_conf.server.enabled %}
export NOMAD_ADDR=https://localhost:{{ nomad_services.http.port }}
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={{ nomad_conf.server.enabled | ternary('server', 'client') }}.global.nomad
export NOMAD_TLS_SERVER_NAME=server.{{ nomad_conf.region }}.nomad
{% endif %}
{% else %}
# TLS not enabled or not running in server mode
{% endif %}