diff options
| -rwxr-xr-x | cluster/prod/app/backup/build/backup-psql/backup-psql.py | 2 | ||||
| -rw-r--r-- | cluster/prod/app/matrix/README.md | 14 | ||||
| -rw-r--r-- | cluster/prod/app/matrix/build/docker-compose.yml | 10 | ||||
| -rw-r--r-- | cluster/prod/app/matrix/build/matrix-synapse/Dockerfile | 9 | ||||
| -rw-r--r-- | cluster/prod/app/matrix/build/riotweb/Dockerfile | 13 |
5 files changed, 34 insertions, 14 deletions
diff --git a/cluster/prod/app/backup/build/backup-psql/backup-psql.py b/cluster/prod/app/backup/build/backup-psql/backup-psql.py index 291cf50..a3a5b5f 100755 --- a/cluster/prod/app/backup/build/backup-psql/backup-psql.py +++ b/cluster/prod/app/backup/build/backup-psql/backup-psql.py @@ -44,6 +44,8 @@ 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}", diff --git a/cluster/prod/app/matrix/README.md b/cluster/prod/app/matrix/README.md new file mode 100644 index 0000000..349a50f --- /dev/null +++ b/cluster/prod/app/matrix/README.md @@ -0,0 +1,14 @@ +# 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. diff --git a/cluster/prod/app/matrix/build/docker-compose.yml b/cluster/prod/app/matrix/build/docker-compose.yml index 6a48f18..3b70b64 100644 --- a/cluster/prod/app/matrix/build/docker-compose.yml +++ b/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: 1.11.49 - image: lxpz/amd64_elementweb:v35 + VERSION: v1.11.78 + image: particallydone/amd64_elementweb:v36 synapse: build: context: ./matrix-synapse args: # https://github.com/matrix-org/synapse/releases - VERSION: 1.95.1 + VERSION: v1.104.0 # 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: v1.2.1 - image: lxpz/amd64_synapse:v58 + S3_VERSION: 2c46a764f700e6439afa11c00db827ddf21a9e89 + image: particallydone/amd64_synapse:v59 diff --git a/cluster/prod/app/matrix/build/matrix-synapse/Dockerfile b/cluster/prod/app/matrix/build/matrix-synapse/Dockerfile index 2ab0b98..5a6f709 100644 --- a/cluster/prod/app/matrix/build/matrix-synapse/Dockerfile +++ b/cluster/prod/app/matrix/build/matrix-synapse/Dockerfile @@ -1,4 +1,4 @@ -FROM amd64/debian:bookworm as builder +FROM amd64/debian:trixie as builder ARG VERSION ARG S3_VERSION @@ -22,11 +22,12 @@ RUN apt-get update && \ libpq-dev \ virtualenv \ libxslt1-dev \ - git && \ - virtualenv /root/matrix-env -p /usr/bin/python3 && \ + git + +RUN virtualenv /root/matrix-env -p /usr/bin/python3 && \ . /root/matrix-env/bin/activate && \ pip3 install \ - https://github.com/matrix-org/synapse/archive/v${VERSION}.tar.gz#egg=matrix-synapse[matrix-synapse-ldap3,postgres,resources.consent,saml2,url_preview] && \ + https://github.com/element-hq/synapse/archive/${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} diff --git a/cluster/prod/app/matrix/build/riotweb/Dockerfile b/cluster/prod/app/matrix/build/riotweb/Dockerfile index c768e87..ec4f5dd 100644 --- a/cluster/prod/app/matrix/build/riotweb/Dockerfile +++ b/cluster/prod/app/matrix/build/riotweb/Dockerfile @@ -1,13 +1,16 @@ -FROM amd64/debian:buster as builder +FROM amd64/debian:trixie as builder ARG VERSION WORKDIR /root RUN apt-get update && \ - 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/ + apt-get install -y wget +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 |