From 257f5c13f0f42583390cd191c78ae9f118ec4a78 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Wed, 16 Nov 2022 14:00:10 +0100
Subject: [PATCH] Update to 2022-11-16 14:00

---
 roles/consul/defaults/main.yml                      | 11 ++++++-----
 roles/nomad/templates/docker_auth.json.j2           | 13 +++++++++++++
 roles/seafile/defaults/main.yml                     |  2 +-
 .../seafile-pro-server_9.0.12_x86-64_CentOS.tar.gz  |  3 ---
 .../seafile-pro-server_9.0.13_x86-64_CentOS.tar.gz  |  3 +++
 5 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 roles/nomad/templates/docker_auth.json.j2
 delete mode 100644 roles/seafile/files/seafile-pro-server_9.0.12_x86-64_CentOS.tar.gz
 create mode 100644 roles/seafile/files/seafile-pro-server_9.0.13_x86-64_CentOS.tar.gz

diff --git a/roles/consul/defaults/main.yml b/roles/consul/defaults/main.yml
index f567508..135b268 100644
--- a/roles/consul/defaults/main.yml
+++ b/roles/consul/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Version of consul to deploy
-consul_version: 1.13.3
+consul_version: 1.14.0
 # URL from where the consul archive will be downloaded
 consul_archive_url: https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_amd64.zip
 # Expected sha256 of the archive
-consul_archive_sha256: 5370b0b5bf765530e28cb80f90dcb47bd7d6ba78176c1ab2430f56e460ed279c
+consul_archive_sha256: 6907e0dc83a05acaa9de60217e44ce55bd05c98152dcef02f9258bd2a474f2b3
 
 # user account under which consul will run (will be created if needed)
 consul_user: consul
@@ -108,9 +108,6 @@ consul_base_conf:
     # TLS settings for interal RPC
     internal_rpc:
       verify_server_hostname: True
-    grpc:
-      # verify_incoming must be disabled on the gRPC endpoint for the envoy proxies when using Consul Connect !
-      verify_incoming: False
 
 consul_extra_conf: {}
 consul_host_conf: {}
@@ -159,6 +156,10 @@ consul_base_services:
     port: 8502
     src_ip: []
     proto: [tcp]
+  grpc_tls:
+    port: 8503
+    src_ip: []
+    proto: [tcp]
   serf_lan:
     port: 8301
     src_ip: []
diff --git a/roles/nomad/templates/docker_auth.json.j2 b/roles/nomad/templates/docker_auth.json.j2
new file mode 100644
index 0000000..58d54a6
--- /dev/null
+++ b/roles/nomad/templates/docker_auth.json.j2
@@ -0,0 +1,13 @@
+{
+  "auths": {
+{% for auth in nomad_conf.client.task_drivers.docker.auths %}
+{% if auth.registry is defined and auth.login is defined and auth.password is defined %}
+    "{{ auth.registry }}": {
+      "auth": "{{ (auth.login ~ ':' ~ auth.password) | b64encode }}"
+    }{% if not loop.last %},{% endif %}
+
+{% endif %}
+{% endfor %}
+
+  }
+}
diff --git a/roles/seafile/defaults/main.yml b/roles/seafile/defaults/main.yml
index 1ed69f3..2e2cb2e 100644
--- a/roles/seafile/defaults/main.yml
+++ b/roles/seafile/defaults/main.yml
@@ -11,7 +11,7 @@
 #   MaxUsers = "9"
 #   Mode = "subscription"
 #   etc...
-seafile_version: "{{ seafile_license is defined | ternary('9.0.12','9.0.9') }}"
+seafile_version: "{{ seafile_license is defined | ternary('9.0.13','9.0.9') }}"
 
 # Archive URL and sha256 are only used for the community version
 seafile_archive_url: https://s3.eu-central-1.amazonaws.com/download.seadrive.org/seafile-server_{{ seafile_version }}_x86-64.tar.gz
diff --git a/roles/seafile/files/seafile-pro-server_9.0.12_x86-64_CentOS.tar.gz b/roles/seafile/files/seafile-pro-server_9.0.12_x86-64_CentOS.tar.gz
deleted file mode 100644
index 04904fc..0000000
--- a/roles/seafile/files/seafile-pro-server_9.0.12_x86-64_CentOS.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ced8cb4964e37640ff04b0aecef47b271b02efc2868b206bcb76da97b7d8cfd
-size 97142176
diff --git a/roles/seafile/files/seafile-pro-server_9.0.13_x86-64_CentOS.tar.gz b/roles/seafile/files/seafile-pro-server_9.0.13_x86-64_CentOS.tar.gz
new file mode 100644
index 0000000..709cafa
--- /dev/null
+++ b/roles/seafile/files/seafile-pro-server_9.0.13_x86-64_CentOS.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f6adec81aa934b445c35dfb8772f9b68b2777266f5f2ca9008d3c1c4c8217f7
+size 97839892