From 7cede37e6d1129b1fcd5e5928856b9a6b52bae4a Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Tue, 25 Jan 2022 12:12:58 +0100
Subject: [PATCH] =?UTF-8?q?Mises=20=C3=A0=20jour=20du=20cluster?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/docker-compose.yml                   | 10 ++--
 app/frontend/deploy/frontend-traefik.hcl | 71 ------------------------
 app/frontend/deploy/frontend-tricot.hcl  |  2 +-
 app/im/deploy/im.hcl                     |  6 +-
 os/config/roles/consul/tasks/main.yml    |  2 +-
 os/config/roles/nomad/tasks/main.yml     |  2 +-
 6 files changed, 11 insertions(+), 82 deletions(-)
 delete mode 100644 app/frontend/deploy/frontend-traefik.hcl

diff --git a/app/docker-compose.yml b/app/docker-compose.yml
index ffc5540..499636c 100644
--- a/app/docker-compose.yml
+++ b/app/docker-compose.yml
@@ -7,21 +7,21 @@ services:
       context: ./im/build/riotweb
       args:
         # https://github.com/vector-im/riot-web/releases
-        VERSION: 1.9.7
-    image: superboum/amd64_riotweb:v26
+        VERSION: 1.9.9
+    image: superboum/amd64_riotweb:v27
 
   synapse:
     build: 
       context: ./im/build/matrix-synapse
       args:
         # https://github.com/matrix-org/synapse/releases
-        VERSION: 1.48.0
+        VERSION: 1.50.2
         # https://github.com/matrix-org/synapse-s3-storage-provider/commits/main
         # Update with the latest commit on main each time you update the synapse version
         # otherwise synapse may fail to launch due to incompatibility issues
         # see this issue for an example: https://github.com/matrix-org/synapse-s3-storage-provider/issues/64
-        S3_VERSION: f821cff55e35a711b45ecb5165d54a4c28f40c9c
-    image: superboum/amd64_synapse:v49
+        S3_VERSION: 8926b4e4178edcda1a32fdb39bd36cef1a1a9d40
+    image: superboum/amd64_synapse:v50
 
   # Email
   sogo:
diff --git a/app/frontend/deploy/frontend-traefik.hcl b/app/frontend/deploy/frontend-traefik.hcl
deleted file mode 100644
index 8fc0fe1..0000000
--- a/app/frontend/deploy/frontend-traefik.hcl
+++ /dev/null
@@ -1,71 +0,0 @@
-job "frontend" {
-  datacenters = ["dc1"]
-  type = "service"
-  priority = 80
-
-  group "traefik" {
-    network {
-      port "http_port" { static = 80 }
-      port "https_port" { static = 443 }
-      port "admin_port" { static = 8082 }
-    }
-
-    task "server" {
-      driver = "docker"
-
-      config {
-        image = "amd64/traefik:1.7.28"
-        readonly_rootfs = true
-        network_mode = "host"
-        volumes = [
-          "secrets/traefik.toml:/etc/traefik/traefik.toml",
-        ]
-        ports = [ "http_port", "https_port", "admin_port" ]
-      }
-
-      resources {
-        memory = 265
-      }
-
-      template {
-        data = file("../config/traefik.toml")
-        destination = "secrets/traefik.toml"
-      }
-
-      service {
-        name = "traefik-http"
-        port = "http_port"
-        tags = [ "(diplonat (tcp_port 80))" ]
-        address_mode = "host"
-      }
-
-      service {
-        name = "traefik-https"
-        port = "https_port"
-        tags = [ "(diplonat (tcp_port 443))" ]
-        address_mode = "host"
-      }
-
-      service {
-        name = "traefik-admin"
-        port = "admin_port"
-        address_mode = "host"
-        check {
-          type = "http"
-          protocol = "http"
-          port = 8082
-          address_mode = "driver"
-          path = "/ping"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 3
-            grace = "90s"
-            ignore_warnings = false
-          }
-        }
-      }
-    }
-  }
-}
-
diff --git a/app/frontend/deploy/frontend-tricot.hcl b/app/frontend/deploy/frontend-tricot.hcl
index 09bbc36..a609f29 100644
--- a/app/frontend/deploy/frontend-tricot.hcl
+++ b/app/frontend/deploy/frontend-tricot.hcl
@@ -14,7 +14,7 @@ job "frontend" {
       driver = "docker"
 
       config {
-        image = "lxpz/amd64_tricot:27"
+        image = "lxpz/amd64_tricot:33"
         network_mode = "host"
         readonly_rootfs = true
         ports = [ "http_port", "https_port", "admin_port" ]
diff --git a/app/im/deploy/im.hcl b/app/im/deploy/im.hcl
index dba2447..a3feed2 100644
--- a/app/im/deploy/im.hcl
+++ b/app/im/deploy/im.hcl
@@ -15,7 +15,7 @@ job "im" {
       driver = "docker"
 
       config {
-        image = "superboum/amd64_synapse:v49"
+        image = "superboum/amd64_synapse:v50"
         network_mode = "host"
         readonly_rootfs = true
         ports = [ "client_port", "federation_port" ]
@@ -138,7 +138,7 @@ job "im" {
       driver = "docker"
 
       config {
-        image = "superboum/amd64_synapse:v49"
+        image = "superboum/amd64_synapse:v50"
         readonly_rootfs = true
         command = "/usr/local/bin/matrix-s3-async"
         work_dir = "/tmp"
@@ -182,7 +182,7 @@ EOH
     task "server" {
       driver = "docker"
       config {
-        image = "superboum/amd64_riotweb:v26"
+        image = "superboum/amd64_riotweb:v27"
         ports = [ "web_port" ]
         volumes = [
           "secrets/config.json:/srv/http/config.json"
diff --git a/os/config/roles/consul/tasks/main.yml b/os/config/roles/consul/tasks/main.yml
index 340d4d7..e0d3b0a 100644
--- a/os/config/roles/consul/tasks/main.yml
+++ b/os/config/roles/consul/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: "Set consul version"
   set_fact:
-    consul_version: 1.9.1
+    consul_version: 1.11.2
 
 - name: "Download and install Consul for x86_64"
   unarchive:
diff --git a/os/config/roles/nomad/tasks/main.yml b/os/config/roles/nomad/tasks/main.yml
index 1ddedbe..7c90a86 100644
--- a/os/config/roles/nomad/tasks/main.yml
+++ b/os/config/roles/nomad/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: "Set nomad version"
   set_fact:
-    nomad_version: 1.0.2
+    nomad_version: 1.2.4
 
 - name: "Download and install Nomad for x86_64"
   unarchive: