tixie/nixcfg
1
0
Fork 0
forked from Deuxfleurs/nixcfg
Code Pull requests Activity

Upgrade Matrix but disable URL preview

Browse source
This commit is contained in:
Quentin 2022-10-28 09:45:00 +02:00
parent 859813440c
commit 40d5665ffe
Signed by untrusted user: quentin
GPG key ID: E9602264D639FF68
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cluster/prod/app/matrix/build/docker-compose.yml
View file

@ -6,18 +6,18 @@ services:
context: ./riotweb context: ./riotweb
args: args:
# https://github.com/vector-im/riot-web/releases # https://github.com/vector-im/riot-web/releases
VERSION: 1.11.3 VERSION: 1.11.12
image: superboum/amd64_riotweb:v31 image: superboum/amd64_riotweb:v32
synapse: synapse:
build: build:
context: ./matrix-synapse context: ./matrix-synapse
args: args:
# https://github.com/matrix-org/synapse/releases # https://github.com/matrix-org/synapse/releases
VERSION: 1.65.0 VERSION: 1.70.0
# https://github.com/matrix-org/synapse-s3-storage-provider/commits/main # 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 # Update with the latest commit on main each time you update the synapse version
# otherwise synapse may fail to launch due to incompatibility issues # 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 # see this issue for an example: https://github.com/matrix-org/synapse-s3-storage-provider/issues/64
S3_VERSION: ffd3fa477321608e57d27644197e721965e0e858 S3_VERSION: 40c6a5599b2d8176318003f84b167ea545cebba3
image: superboum/amd64_synapse:v54 image: superboum/amd64_synapse:v55

10
cluster/prod/app/matrix/build/matrix-synapse/Dockerfile
View file

@ -1,4 +1,4 @@
FROM amd64/debian:buster as builder FROM amd64/debian:bookworm as builder
ARG VERSION ARG VERSION
ARG S3_VERSION ARG S3_VERSION
@ -16,6 +16,8 @@ RUN apt-get update && \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libxml2-dev \ libxml2-dev \
zlib1g-dev \ zlib1g-dev \
rustc \
cargo \
# postgresql-dev \ # postgresql-dev \
libpq-dev \ libpq-dev \
virtualenv \ virtualenv \
@ -28,16 +30,16 @@ RUN apt-get update && \
pip3 install \ pip3 install \
git+https://github.com/matrix-org/synapse-s3-storage-provider.git@${S3_VERSION} git+https://github.com/matrix-org/synapse-s3-storage-provider.git@${S3_VERSION}
FROM amd64/debian:buster FROM amd64/debian:bookworm
RUN apt-get update && \ RUN apt-get update && \
apt-get -qq -y full-upgrade && \ apt-get -qq -y full-upgrade && \
apt-get install -y \ apt-get install -y \
python3 \ python3 \
python3-distutils \ python3-distutils \
libffi6 \ libffi8 \
libjpeg62-turbo \ libjpeg62-turbo \
libssl1.1 \ libssl3 \
libxslt1.1 \ libxslt1.1 \
libpq5 \ libpq5 \
zlib1g \ zlib1g \

2
cluster/prod/app/matrix/config/synapse/homeserver.yaml
View file

@ -184,7 +184,7 @@ thumbnail_sizes:
# Is the preview URL API enabled? If enabled, you *must* specify # Is the preview URL API enabled? If enabled, you *must* specify
# an explicit url_preview_ip_range_blacklist of IPs that the spider is # an explicit url_preview_ip_range_blacklist of IPs that the spider is
# denied from accessing. # denied from accessing.
url_preview_enabled: True url_preview_enabled: False
# List of IP address CIDR ranges that the URL preview spider is denied # List of IP address CIDR ranges that the URL preview spider is denied
# from accessing. There are no defaults: you must explicitly # from accessing. There are no defaults: you must explicitly

6
cluster/prod/app/matrix/deploy/im.hcl
View file

@ -14,7 +14,7 @@ job "matrix" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_synapse:v54" image = "superboum/amd64_synapse:v55"
network_mode = "host" network_mode = "host"
readonly_rootfs = true readonly_rootfs = true
ports = [ "api_port" ] ports = [ "api_port" ]
@ -113,7 +113,7 @@ job "matrix" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_synapse:v54" image = "superboum/amd64_synapse:v55"
readonly_rootfs = true readonly_rootfs = true
command = "/usr/local/bin/matrix-s3-async" command = "/usr/local/bin/matrix-s3-async"
work_dir = "/tmp" work_dir = "/tmp"
@ -157,7 +157,7 @@ EOH
task "server" { task "server" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_riotweb:v31" image = "superboum/amd64_riotweb:v32"
ports = [ "web_port" ] ports = [ "web_port" ]
volumes = [ volumes = [
"secrets/config.json:/srv/http/config.json" "secrets/config.json:/srv/http/config.json"