From b47821acb1dbd275bfb11d5001d66a1e857eb37c Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Thu, 14 Sep 2023 17:00:20 +0200
Subject: [PATCH] Update to 2023-09-14 17:00

---
 roles/mkdir/handlers/main.yml      |  5 +++++
 roles/nginx/tasks/install.yml      |  6 ++++++
 roles/nomad/defaults/main.yml      |  2 ++
 roles/nomad/templates/nomad.hcl.j2 | 31 +++++++++++++++++++++++++-----
 roles/nomad_bin/defaults/main.yml  |  4 ++--
 roles/vault_bin/defaults/main.yml  |  4 ++--
 6 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 roles/mkdir/handlers/main.yml

diff --git a/roles/mkdir/handlers/main.yml b/roles/mkdir/handlers/main.yml
new file mode 100644
index 0000000..14f3b33
--- /dev/null
+++ b/roles/mkdir/handlers/main.yml
@@ -0,0 +1,5 @@
+---
+
+- name: restart journald
+  service: name=systemd-journald state=restarted
+
diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml
index 5e64380..39374f2 100644
--- a/roles/nginx/tasks/install.yml
+++ b/roles/nginx/tasks/install.yml
@@ -1,5 +1,11 @@
 ---
 
+- name: Install python-passlib
+  package:
+    name:
+      - python-passlib
+  tags: nginx
+
 - include_tasks: install_openresty.yml
   when: nginx_openresty
   tags: always
diff --git a/roles/nomad/defaults/main.yml b/roles/nomad/defaults/main.yml
index c556528..957e483 100644
--- a/roles/nomad/defaults/main.yml
+++ b/roles/nomad/defaults/main.yml
@@ -189,6 +189,8 @@ nomad_base_conf:
         service_scheduler_enabled: True
         sysbatch_scheduler_enabled: True
 
+    # heartbeat_grace: 10m
+
 
   # UI related settings
   ui:
diff --git a/roles/nomad/templates/nomad.hcl.j2 b/roles/nomad/templates/nomad.hcl.j2
index 37c6749..311a51a 100644
--- a/roles/nomad/templates/nomad.hcl.j2
+++ b/roles/nomad/templates/nomad.hcl.j2
@@ -40,9 +40,6 @@ acl {
 server {
   enabled = {{ nomad_conf.server.enabled | ternary('true', 'false') }}
   bootstrap_expect = {{ nomad_conf.server.bootstrap_expect }}
-{% if nomad_conf.server.encrypt is defined %}
-  encrypt = "{{ nomad_conf.server.encrypt }}"
-{% endif %}
   server_join {
     retry_join = [
 {% for server in nomad_servers %}
@@ -50,9 +47,33 @@ server {
 {% endfor %}
     ]
   }
-{% if nomad_conf.server.authoritative_region is defined %}
-  authoritative_region = "{{ nomad_conf.server.authoritative_region }}"
+
+{% for setting in [
+    'authoritative_region',
+    'encrypt',
+    'node_gc_threshold',
+    'job_gc_interval',
+    'job_gc_threshold',
+    'eval_gc_threshold',
+    'batch_eval_gc_threshold',
+    'deployment_gc_threshold',
+    'csi_volume_claim_gc_interval',
+    'csi_volume_claim_gc_threshold',
+    'csi_plugin_gc_threshold',
+    'acl_token_gc_threshold',
+    'heartbeat_grace',
+    'min_heartbeat_ttl',
+    'failover_heartbeat_ttl',
+    'license_path',
+    'root_key_gc_interval',
+    'root_key_gc_threshold',
+    'root_key_rotation_threshold',
+    'job_max_source_size'
+  ] %}
+{% if nomad_conf.server[setting] is defined %}
+  {{ setting }} = "{{ nomad_conf.server[setting] }}"
 {% endif %}
+{% endfor %}
 
   default_scheduler_config {
     scheduler_algorithm = "{{ nomad_conf.server.default_scheduler_config.scheduler_algorithm }}"
diff --git a/roles/nomad_bin/defaults/main.yml b/roles/nomad_bin/defaults/main.yml
index b5b2e0e..fba1b95 100644
--- a/roles/nomad_bin/defaults/main.yml
+++ b/roles/nomad_bin/defaults/main.yml
@@ -1,9 +1,9 @@
 ---
 
 # Version of Nomad to install
-nomad_version: 1.6.1
+nomad_version: 1.6.2
 # URL of the archive
 nomad_archive_url: https://releases.hashicorp.com/nomad/{{ nomad_version }}/nomad_{{ nomad_version }}_linux_amd64.zip
 # Expected sha256 of the archive
-nomad_archive_sha256: e4c01c51c393b266aee4ff184dd97704ae3d838c233a6189425a9f1c31a55f4f
+nomad_archive_sha256: f6f879a359a667a6b1ca4366abd8383d89118dabd0d28af5bbc4721685ff17b8
 
diff --git a/roles/vault_bin/defaults/main.yml b/roles/vault_bin/defaults/main.yml
index a419514..212f86d 100644
--- a/roles/vault_bin/defaults/main.yml
+++ b/roles/vault_bin/defaults/main.yml
@@ -1,7 +1,7 @@
 # Version of Vault to install
-vault_version: 1.14.2
+vault_version: 1.14.3
 # URL of the archive
 vault_archive_url: https://releases.hashicorp.com/vault/{{ vault_version }}/vault_{{ vault_version }}_linux_amd64.zip
 # Expected sha256 of the archive
-vault_archive_sha256: 134a4b8d9473722b2d37d4677e8e5c7e18f5010f8866c4bbb84e2cef3daea532
+vault_archive_sha256: 01e1698d2563cf4780438468f9f815eedf707e8ea01f87bb7621e24a00e21d12