cluster/prod/app/backup/README.md

@@ -1,32 +0,0 @@
-## Pour remonter locement un backup de PSQL fait par Nomad (backup-weekly.hcl)
-
-```bash
-export AWS_BUCKET=backups-pgbasebackup
-export AWS_ENDPOINT=s3.deuxfleurs.shirokumo.net
-export AWS_ACCESS_KEY_ID=$(consul kv get "secrets/postgres/backup/aws_access_key_id")
-export AWS_SECRET_ACCESS_KEY=$(consul kv get secrets/postgres/backup/aws_secret_access_key)
-export CRYPT_PUBLIC_KEY=$(consul kv get secrets/postgres/backup/crypt_public_key)
-```
-
-Et voilà le travail : 
-
-```bash
-$ aws s3 --endpoint https://$AWS_ENDPOINT ls
-2022-04-14 17:00:50 backups-pgbasebackup
-
-$ aws s3 --endpoint https://$AWS_ENDPOINT ls s3://backups-pgbasebackup
-                           PRE 2024-07-28 00:00:36.140539/
-                           PRE 2024-08-04 00:00:21.291551/
-                           PRE 2024-08-11 00:00:26.589762/
-                           PRE 2024-08-18 00:00:40.873939/
-                           PRE 2024-08-25 01:03:54.672763/
-                           PRE 2024-09-01 00:00:20.019605/
-                           PRE 2024-09-08 00:00:16.969740/
-                           PRE 2024-09-15 00:00:37.951459/
-                           PRE 2024-09-22 00:00:21.030452/
-
-$ aws s3 --endpoint https://$AWS_ENDPOINT ls "s3://backups-pgbasebackup/2024-09-22 00:00:21.030452/"
-2024-09-22 03:23:28     623490 backup_manifest
-2024-09-22 03:25:32 6037121487 base.tar.gz
-2024-09-22 03:25:33   19948939 pg_wal.tar.gz
-```

cluster/prod/app/backup/build/backup-psql/backup-psql.py

@@ -44,8 +44,6 @@ if not client.bucket_exists(bucket):
   abort(f"Bucket {bucket} does not exist or its access is forbidden, aborting")
 
 # Perform the backup locally
-# Via command-line:
-# pg_basebackup --host=localhost --username=$PSQL_USER --pgdata=. --format=tar  --wal-method=stream --gzip --compress=6 --progress --max-rate=5M
 try:
   ret = subprocess.run(["pg_basebackup",
     f"--host={psql_host}",

cluster/prod/app/cryptpad/build/default.nix

@@ -71,16 +71,16 @@
   });
 in buildNpmPackage rec {
   pname = "cryptpad";
-  version = "2024.9.0";
+  version = "2024.6.1";
 
   src = fetchFromGitHub {
     owner = "cryptpad";
     repo = "cryptpad";
     rev = version;
-    hash = "sha256-OUtWaDVLRUbKS0apwY0aNq4MalGFv+fH9VA7LvWWYRs=";
+    hash = "sha256-qwyXpTY8Ds7R5687PVGZa/rlEyrAZjNzJ4+VQZpF8v0=";
   };
 
-  npmDepsHash = "sha256-pK0b7q1kJja9l8ANwudbfo3jpldwuO56kuulS8X9A5s=";
+  npmDepsHash = "sha256-GSTPsXqe/rxiDh5OW2t+ZY1YRNgRSDxkJ0pvcLIFtFw=";
 
   inherit nodejs;
 

cluster/prod/app/cryptpad/build/npins/sources.json

@@ -3,8 +3,8 @@
     "nixpkgs": {
       "type": "Channel",
       "name": "nixos-24.05",
-      "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.5385.1719f27dd95f/nixexprs.tar.xz",
+      "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.3311.a1cc729dcbc3/nixexprs.tar.xz",
-      "hash": "0f7i315g1z8kjh10hvj2zv7y2vfqxmwvd96hwlcrr8aig6qq5gzm"
+      "hash": "13al93fac4xdxj0jllfby2v9klwqdhsf3yg10mnsm9ys84v7gsnn"
     }
   },
   "version": 3

cluster/prod/app/cryptpad/deploy/cryptpad.hcl

@@ -26,7 +26,7 @@ job "cryptpad" {
       }
 
       config {
-        image = "kokakiwi/cryptpad:2024.9.0"
+        image = "kokakiwi/cryptpad:2024.6.1"
         ports = [ "http" ]
 
         volumes = [

cluster/prod/app/jitsi/build/docker-compose.yml

@@ -7,7 +7,6 @@ services:
       args:
         # https://github.com/jitsi/jitsi-meet
         MEET_TAG: stable/jitsi-meet_9646
-        NODE_MAJOR_VERSION: 22
     image: superboum/amd64_jitsi_meet:v7
 
   jitsi-conference-focus:

cluster/prod/app/jitsi/build/jitsi-meet/Dockerfile

@@ -1,9 +1,8 @@
 FROM debian:bookworm AS builder
 
-ARG NODE_MAJOR_VERSION
 RUN apt-get update && \
     apt-get install -y curl && \
-    curl -sL https://deb.nodesource.com/setup_${NODE_MAJOR_VERSION}.x | bash - && \
+    curl -sL https://deb.nodesource.com/setup_22.x | bash - && \
     apt-get install -y git nodejs make git unzip
 
 ARG MEET_TAG

cluster/prod/app/jitsi/build/jitsi-videobridge/jvb_run

@@ -6,7 +6,7 @@ if [ -z "${JITSI_NAT_LOCAL_IP}" ]; then
 fi
 
 if [ -z "${JITSI_NAT_PUBLIC_IP}" ]; then
-  JITSI_NAT_PUBLIC_IP=$(curl -4 https://ifconfig.me)
+  JITSI_NAT_PUBLIC_IP=$(curl https://ifconfig.me)
 fi
 
 echo "NAT config: ${JITSI_NAT_LOCAL_IP} -> ${JITSI_NAT_PUBLIC_IP}"

cluster/prod/app/jitsi/config/videobridge.conf

@@ -115,8 +115,7 @@ videobridge {
     # (e.g. health or debug stats)
     private {
       # See JettyBundleActivatorConfig in Jicoco for values
-      host = 0.0.0.0
+      host = 127.0.0.1
-      port = {{ env "NOMAD_PORT_management_port" }}
     }
   }
   octo {

cluster/prod/app/jitsi/deploy/jitsi.hcl

@@ -20,7 +20,7 @@ job "jitsi" {
     task "xmpp" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_xmpp:v12"
+        image = "superboum/amd64_jitsi_xmpp:v11"
         ports = [ "bosh_port", "xmpp_port" ]
         network_mode = "host"
         volumes = [
@@ -101,7 +101,7 @@ EOF
     task "front" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_meet:v7"
+        image = "superboum/amd64_jitsi_meet:v6"
         network_mode = "host"
         ports = [ "https_port" ]
         volumes = [
@@ -168,7 +168,7 @@ EOF
     task "jicofo" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_conference_focus:v11"
+        image = "superboum/amd64_jitsi_conference_focus:v10"
         network_mode = "host"
         volumes = [
           "secrets/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt",
@@ -203,15 +203,14 @@ EOF
   group "data_plane" {
     network {
       port "video_port" { static = 8080 }
-      port "management_port" { static = 8000 }
     }
 
     task "videobridge" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_videobridge:v22"
+        image = "superboum/amd64_jitsi_videobridge:v21"
         network_mode = "host"
-        ports = [ "video_port", "management_port" ] 
+        ports = [ "video_port" ] 
         ulimit {
           nofile = "1048576:1048576"
           nproc = "65536:65536"
@@ -260,16 +259,9 @@ EOF
         port = "video_port"
         address_mode = "host"
         name = "video-jitsi"
-      }
-
-      service {
-        tags = [ "jitsi" ]
-        port = "management_port"
-        address_mode = "host"
-        name = "management-video-jitsi"
         check {
           type = "tcp"
-          port = "management_port"
+          port = "video_port"
           interval = "60s"
           timeout = "5s"
         }

cluster/prod/app/jitsi/integration/README.md

@@ -52,7 +52,7 @@ But maybe this value is deprecated: the check is still here but it is not used a
 start a maintainance container
 
 ```
-docker run --rm -it -v `pwd`/prosody/certs/:/var/lib/prosody/ -v `pwd`/prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro --user root superboum/amd64_jitsi_xmpp:v12 bash
+docker run --rm -it -v `pwd`/prosody/certs/:/var/lib/prosody/ -v `pwd`/prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro --user root superboum/amd64_jitsi_xmpp:v11 bash
 ```
 
 then generate certificates from inside this container

cluster/prod/app/jitsi/integration/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   jitsi-xmpp:
-    image: superboum/amd64_jitsi_xmpp:v12
+    image: superboum/amd64_jitsi_xmpp:v11
     volumes:
       - "./prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro"
       - "./prosody/certs/jitsi.crt:/var/lib/prosody/jitsi.crt:ro"
@@ -11,19 +11,16 @@ services:
     environment:
       - JICOFO_AUTH_PASSWORD=jicofopass
       - JVB_AUTH_PASSWORD=jvbpass
-    ports:
-      - "5222:5222/tcp"
  
   jitsi-conference-focus:
-    image: superboum/amd64_jitsi_conference_focus:v11
+    image: superboum/amd64_jitsi_conference_focus:v10
     volumes:
       - "./prosody/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt:ro"
       - "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro"
       - "./jicofo/jicofo.conf:/etc/jitsi/jicofo.conf:ro"
 
   jitsi-videobridge:
-    image: superboum/amd64_jitsi_videobridge:v22
+    image: superboum/amd64_jitsi_videobridge:v21
-    network_mode: "host"
     volumes:
       - "./prosody/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt:ro"
       - "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro"
@@ -34,7 +31,7 @@ services:
       - "10000:10000/udp"
 
   jitsi-meet:
-    image: superboum/amd64_jitsi_meet:v7
+    image: superboum/amd64_jitsi_meet:v6
     volumes:
       - "./prosody/certs/jitsi.crt:/etc/nginx/jitsi.crt:ro"
       - "./prosody/certs/jitsi.key:/etc/nginx/jitsi.key:ro"

cluster/prod/app/jitsi/integration/jvb/videobridge.conf

@@ -62,7 +62,7 @@ videobridge {
 
       configs {
         unique-xmpp-server {
-          hostname="172.17.0.1"
+          hostname="jitsi-xmpp"
           domain = "auth.jitsi"
           username = "jvb"
           password = "jvbpass"

cluster/prod/app/jitsi/integration/meet/config.js

@@ -22,7 +22,7 @@ var config = {
     },
 
     // BOSH URL. FIXME: use XEP-0156 to discover it.
-    bosh: '//[2a0c:e303:0:2a00::de6]/http-bind',
+    bosh: '//192.168.1.143/http-bind',
 
     // Websocket URL
     // websocket: 'wss://jitsi-meet.example.com/xmpp-websocket',

cluster/prod/app/matrix/README.md

@@ -1,14 +0,0 @@
-# Informations relatives à la config Matrix
-
-## Ressources
-
-- La doc de Synapse est là : https://element-hq.github.io/synapse/latest/welcome_and_overview.html
-
-### Métriques 
-
-- La page pour configurer les metrics : https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html?highlight=metrics#metrics
-- La page pour le tutoriel sur configurer les metrics avec Prometheus : https://element-hq.github.io/synapse/latest/metrics-howto.html?highlight=metrics#how-to-monitor-synapse-metrics-using-prometheus
-
----
-
-> Avec Nix on n'aurait pas tous ces problèmes.

cluster/prod/app/matrix/build/docker-compose.yml

@@ -6,18 +6,18 @@ services:
       context: ./riotweb
       args:
         # https://github.com/vector-im/element-web/releases
-        VERSION: v1.11.78
+        VERSION: 1.11.49
-    image: particallydone/amd64_elementweb:v36
+    image: lxpz/amd64_elementweb:v35
 
   synapse:
     build:
       context: ./matrix-synapse
       args:
         # https://github.com/matrix-org/synapse/releases
-        VERSION: v1.104.0
+        VERSION: 1.95.1
         # 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: 2c46a764f700e6439afa11c00db827ddf21a9e89
+        S3_VERSION: v1.2.1
-    image: particallydone/amd64_synapse:v60
+    image: lxpz/amd64_synapse:v58

cluster/prod/app/matrix/build/matrix-synapse/Dockerfile

@@ -1,4 +1,4 @@
-FROM amd64/debian:trixie AS builder
+FROM amd64/debian:bookworm as builder
 
 ARG VERSION
 ARG S3_VERSION
@@ -22,25 +22,21 @@ RUN apt-get update && \
       libpq-dev \
       virtualenv \
       libxslt1-dev \
-      git
+      git && \
-
+    virtualenv /root/matrix-env -p /usr/bin/python3 && \
-RUN virtualenv /root/matrix-env -p /usr/bin/python3 && \
     . /root/matrix-env/bin/activate && \
     pip3 install \
-      https://github.com/element-hq/synapse/archive/${VERSION}.tar.gz#egg=matrix-synapse[matrix-synapse-ldap3,postgres,resources.consent,saml2,url_preview] && \
+      https://github.com/matrix-org/synapse/archive/v${VERSION}.tar.gz#egg=matrix-synapse[matrix-synapse-ldap3,postgres,resources.consent,saml2,url_preview] && \
     pip3 install \
       git+https://github.com/matrix-org/synapse-s3-storage-provider.git@${S3_VERSION}
 
-# WARNING: trixie n'est pas une LTS
+FROM amd64/debian:bookworm
-# mais on est obligé d'avoir la même version que le builder
-# et le builder veut une version de rustc qui n'est pas dans bookworm (dernière LTS at the time of writing)
-FROM amd64/debian:trixie
 
 RUN apt-get update && \
     apt-get -qq -y full-upgrade && \
     apt-get install -y \
       python3 \
-      python3-setuptools \
+      python3-distutils \
       libffi8 \
       libjpeg62-turbo \
       libssl3 \

cluster/prod/app/matrix/build/riotweb/Dockerfile

@@ -1,16 +1,13 @@
-FROM amd64/debian:trixie as builder
+FROM amd64/debian:buster as builder
 
 ARG VERSION
 WORKDIR /root
 
 RUN apt-get update && \
-    apt-get install -y wget
+    apt-get install -y wget && \
+    wget https://github.com/vector-im/element-web/releases/download/v${VERSION}/element-v${VERSION}.tar.gz && \
+    tar xf element-v${VERSION}.tar.gz && \
+    mv element-v${VERSION}/ riot/
 
-RUN wget https://github.com/element-hq/element-web/releases/download/${VERSION}/element-${VERSION}.tar.gz && \
-    tar xf element-${VERSION}.tar.gz && \
-    mv element-${VERSION}/ riot/
-
-# Le conteneur de superboum contient uniquement un serveur web de 5 lignes.
-# Ca vous ennuie ? On peut publier Riot dans un bucket web Garage, tkt, ça sera Tricot qui servira.
 FROM superboum/amd64_webserver:v3
 COPY --from=builder /root/riot /srv/http

cluster/prod/app/matrix/deploy/im.hcl

@@ -15,7 +15,7 @@ job "matrix" {
       driver = "docker"
 
       config {
-        image = "particallydone/amd64_synapse:v60"
+        image = "lxpz/amd64_synapse:v58"
         network_mode = "host"
         readonly_rootfs = true
         ports = [ "api_port" ]
@@ -101,7 +101,7 @@ job "matrix" {
       driver = "docker"
 
       config {
-        image = "particallydone/amd64_synapse:v60"
+        image = "lxpz/amd64_synapse:v58"
         readonly_rootfs = true
         command = "/usr/local/bin/matrix-s3-async"
         work_dir = "/tmp"
@@ -137,7 +137,7 @@ EOH
     task "riotweb" {
       driver = "docker"
       config {
-        image = "particallydone/amd64_elementweb:v36"
+        image = "lxpz/amd64_elementweb:v35"
         ports = [ "web_port" ]
         volumes = [
           "secrets/config.json:/srv/http/config.json"
@@ -190,7 +190,7 @@ EOH
       driver = "docker"
 
       config {
-        image = "ghcr.io/matrix-org/sliding-sync:v0.99.16"
+        image = "ghcr.io/matrix-org/sliding-sync:v0.99.12"
         ports = [ "syncv3_api", "syncv3_metrics" ]
       }
 

cluster/prod/app/telemetry/config/prometheus.yml

@@ -26,16 +26,6 @@ scrape_configs:
         cert_file: /etc/prometheus/consul-client.crt
         key_file: /etc/prometheus/consul-client.key
 
-  - job_name: 'jitsi-videobridge'
-    consul_sd_configs:
-    - server: 'https://localhost:8501'
-      services:
-        - 'management-video-jitsi'
-      tls_config:
-        ca_file: /etc/prometheus/consul-ca.crt
-        cert_file: /etc/prometheus/consul-client.crt
-        key_file: /etc/prometheus/consul-client.key
-
   - job_name: 'garage'
     authorization:
       type: Bearer

cluster/prod/app/telemetry/deploy/telemetry-storage.hcl

@@ -20,7 +20,7 @@ job "telemetry-storage" {
     task "prometheus" {
       driver = "docker"
       config {
-        image = "prom/prometheus:v2.50.1"
+        image = "prom/prometheus:v2.46.0"
         network_mode = "host"
         ports = [ "prometheus" ]
         args = [