Deploy Matrix
This commit is contained in:
parent
3be2659aa1
commit
e37c1f9057
40 changed files with 959 additions and 7 deletions
|
@ -8,6 +8,11 @@ job "garage" {
|
|||
value = "amd64"
|
||||
}
|
||||
|
||||
update {
|
||||
max_parallel = 1
|
||||
min_healthy_time = "60s"
|
||||
}
|
||||
|
||||
group "garage" {
|
||||
network {
|
||||
port "s3" { static = 3900 }
|
||||
|
@ -45,7 +50,7 @@ job "garage" {
|
|||
}
|
||||
|
||||
resources {
|
||||
memory = 1500
|
||||
memory = 1000
|
||||
cpu = 1000
|
||||
}
|
||||
|
||||
|
|
23
cluster/prod/app/matrix/build/docker-compose.yml
Normal file
23
cluster/prod/app/matrix/build/docker-compose.yml
Normal file
|
@ -0,0 +1,23 @@
|
|||
version: '3.4'
|
||||
services:
|
||||
# Instant Messaging
|
||||
riot:
|
||||
build:
|
||||
context: ./riotweb
|
||||
args:
|
||||
# https://github.com/vector-im/riot-web/releases
|
||||
VERSION: 1.11.3
|
||||
image: superboum/amd64_riotweb:v31
|
||||
|
||||
synapse:
|
||||
build:
|
||||
context: ./matrix-synapse
|
||||
args:
|
||||
# https://github.com/matrix-org/synapse/releases
|
||||
VERSION: 1.65.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: ffd3fa477321608e57d27644197e721965e0e858
|
||||
image: superboum/amd64_synapse:v54
|
52
cluster/prod/app/matrix/build/matrix-synapse/Dockerfile
Normal file
52
cluster/prod/app/matrix/build/matrix-synapse/Dockerfile
Normal file
|
@ -0,0 +1,52 @@
|
|||
FROM amd64/debian:buster as builder
|
||||
|
||||
ARG VERSION
|
||||
ARG S3_VERSION
|
||||
RUN apt-get update && \
|
||||
apt-get -qq -y full-upgrade && \
|
||||
apt-get install -y \
|
||||
python3 \
|
||||
python3-pip \
|
||||
python3-dev \
|
||||
python3-setuptools \
|
||||
libffi-dev \
|
||||
build-essential \
|
||||
libssl-dev \
|
||||
libjpeg-dev \
|
||||
libjpeg62-turbo-dev \
|
||||
libxml2-dev \
|
||||
zlib1g-dev \
|
||||
# postgresql-dev \
|
||||
libpq-dev \
|
||||
virtualenv \
|
||||
libxslt1-dev \
|
||||
git && \
|
||||
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] && \
|
||||
pip3 install \
|
||||
git+https://github.com/matrix-org/synapse-s3-storage-provider.git@${S3_VERSION}
|
||||
|
||||
FROM amd64/debian:buster
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get -qq -y full-upgrade && \
|
||||
apt-get install -y \
|
||||
python3 \
|
||||
python3-distutils \
|
||||
libffi6 \
|
||||
libjpeg62-turbo \
|
||||
libssl1.1 \
|
||||
libxslt1.1 \
|
||||
libpq5 \
|
||||
zlib1g \
|
||||
libjemalloc2 \
|
||||
ca-certificates
|
||||
|
||||
ENV LD_PRELOAD /usr/lib/x86_64-linux-gnu/libjemalloc.so.2
|
||||
COPY --from=builder /root/matrix-env /root/matrix-env
|
||||
COPY matrix-s3-async /usr/local/bin/matrix-s3-async
|
||||
COPY entrypoint.sh /usr/local/bin/entrypoint
|
||||
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint"]
|
3
cluster/prod/app/matrix/build/matrix-synapse/entrypoint.sh
Executable file
3
cluster/prod/app/matrix/build/matrix-synapse/entrypoint.sh
Executable file
|
@ -0,0 +1,3 @@
|
|||
#!/bin/sh
|
||||
. /root/matrix-env/bin/activate
|
||||
exec "$@"
|
16
cluster/prod/app/matrix/build/matrix-synapse/matrix-s3-async
Executable file
16
cluster/prod/app/matrix/build/matrix-synapse/matrix-s3-async
Executable file
|
@ -0,0 +1,16 @@
|
|||
#!/bin/bash
|
||||
|
||||
cat > database.yaml <<EOF
|
||||
user: $PG_USER
|
||||
password: $PG_PASS
|
||||
database: $PG_DB
|
||||
host: $PG_HOST
|
||||
port: $PG_PORT
|
||||
EOF
|
||||
|
||||
while true; do
|
||||
/root/matrix-env/bin/s3_media_upload update-db 0d
|
||||
/root/matrix-env/bin/s3_media_upload --no-progress check-deleted /var/lib/matrix-synapse/media
|
||||
/root/matrix-env/bin/s3_media_upload --no-progress upload /var/lib/matrix-synapse/media matrix --delete --endpoint-url https://garage.deuxfleurs.fr
|
||||
sleep 600
|
||||
done
|
13
cluster/prod/app/matrix/build/riotweb/Dockerfile
Normal file
13
cluster/prod/app/matrix/build/riotweb/Dockerfile
Normal file
|
@ -0,0 +1,13 @@
|
|||
FROM amd64/debian:buster 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/
|
||||
|
||||
FROM superboum/amd64_webserver:v3
|
||||
COPY --from=builder /root/riot /srv/http
|
19
cluster/prod/app/matrix/config/coturn/turnserver.conf.tpl
Normal file
19
cluster/prod/app/matrix/config/coturn/turnserver.conf.tpl
Normal file
|
@ -0,0 +1,19 @@
|
|||
use-auth-secret
|
||||
static-auth-secret={{ key "secrets/chat/coturn/static-auth" | trimSpace }}
|
||||
realm=turn.deuxfleurs.fr
|
||||
|
||||
# VoIP traffic is all UDP. There is no reason to let users connect to arbitrary TCP endpoints via the relay.
|
||||
#no-tcp-relay
|
||||
|
||||
# don't let the relay ever try to connect to private IP address ranges within your network (if any)
|
||||
# given the turn server is likely behind your firewall, remember to include any privileged public IPs too.
|
||||
#denied-peer-ip=10.0.0.0-10.255.255.255
|
||||
#denied-peer-ip=192.168.0.0-192.168.255.255
|
||||
#denied-peer-ip=172.16.0.0-172.31.255.255
|
||||
|
||||
# consider whether you want to limit the quota of relayed streams per user (or total) to avoid risk of DoS.
|
||||
user-quota=12 # 4 streams per video call, so 12 streams = 3 simultaneous relayed calls per user.
|
||||
total-quota=1200
|
||||
|
||||
min-port=49152
|
||||
max-port=49252
|
17
cluster/prod/app/matrix/config/easybridge/config.json.tpl
Normal file
17
cluster/prod/app/matrix/config/easybridge/config.json.tpl
Normal file
|
@ -0,0 +1,17 @@
|
|||
{
|
||||
"log_level": "info",
|
||||
"easybridge_avatar": "/app/easybridge.jpg",
|
||||
|
||||
"web_bind_addr": "0.0.0.0:8281",
|
||||
"web_url": "https://easybridge.deuxfleurs.fr",
|
||||
"web_session_key": "{{ key "secrets/chat/easybridge/web_session_key" | trimSpace }}",
|
||||
|
||||
"appservice_bind_addr": "0.0.0.0:8321",
|
||||
"registration": "/data/registration.yaml",
|
||||
"homeserver_url": "https://im.deuxfleurs.fr",
|
||||
"matrix_domain": "deuxfleurs.fr",
|
||||
"name_format": "{}_ezbr_",
|
||||
|
||||
"db_type": "postgres",
|
||||
"db_path": "host=psql-proxy.service.2.cluster.deuxfleurs.fr port=5432 user={{ key "secrets/chat/easybridge/db_user" | trimSpace }} dbname=easybridge password={{ key "secrets/chat/easybridge/db_pass" | trimSpace }} sslmode=disable"
|
||||
}
|
|
@ -0,0 +1,14 @@
|
|||
id: Easybridge
|
||||
url: http://easybridge-api.service.2.cluster.deuxfleurs.fr:8321
|
||||
as_token: {{ key "secrets/chat/easybridge/as_token" | trimSpace }}
|
||||
hs_token: {{ key "secrets/chat/easybridge/hs_token" | trimSpace }}
|
||||
sender_localpart: _ezbr_
|
||||
rate_limited: false
|
||||
namespaces:
|
||||
users:
|
||||
- exclusive: true
|
||||
regex: '@.*_ezbr_'
|
||||
aliases:
|
||||
- exclusive: true
|
||||
regex: '#.*_ezbr_'
|
||||
rooms: []
|
49
cluster/prod/app/matrix/config/riot_web/config.json
Normal file
49
cluster/prod/app/matrix/config/riot_web/config.json
Normal file
|
@ -0,0 +1,49 @@
|
|||
{
|
||||
"default_server_config": {
|
||||
"m.homeserver": {
|
||||
"base_url": "https://im.deuxfleurs.fr",
|
||||
"server_name": "deuxfleurs.fr"
|
||||
},
|
||||
"m.identity_server": {
|
||||
"base_url": "https://vector.im"
|
||||
}
|
||||
},
|
||||
"disable_custom_urls": false,
|
||||
"disable_guests": false,
|
||||
"disable_login_language_selector": false,
|
||||
"disable_3pid_login": false,
|
||||
"brand": "Deuxfleurs",
|
||||
"integrations_ui_url": "https://scalar.vector.im/",
|
||||
"integrations_rest_url": "https://scalar.vector.im/api",
|
||||
"integrations_widgets_urls": [
|
||||
"https://scalar.vector.im/_matrix/integrations/v1",
|
||||
"https://scalar.vector.im/api",
|
||||
"https://scalar-staging.vector.im/_matrix/integrations/v1",
|
||||
"https://scalar-staging.vector.im/api",
|
||||
"https://scalar-staging.riot.im/scalar/api"
|
||||
],
|
||||
"bug_report_endpoint_url": "https://element.io/bugreports/submit",
|
||||
"defaultCountryCode": "FR",
|
||||
"showLabsSettings": true,
|
||||
"features": {
|
||||
"feature_new_spinner": true,
|
||||
"feature_groups": "labs",
|
||||
"feature_pinning": "labs"
|
||||
},
|
||||
"default_federate": true,
|
||||
"default_theme": "light",
|
||||
"roomDirectory": {
|
||||
"servers": [
|
||||
"deuxfleurs.fr",
|
||||
"matrix.org",
|
||||
"tedomum.net",
|
||||
"zinz.dev"
|
||||
]
|
||||
},
|
||||
"settingDefaults": {
|
||||
"breadcrumbs": true
|
||||
},
|
||||
"jitsi": {
|
||||
"preferredDomain": "jitsi.deuxfleurs.fr"
|
||||
}
|
||||
}
|
|
@ -0,0 +1 @@
|
|||
report_stats: true
|
|
@ -0,0 +1 @@
|
|||
server_name: deuxfleurs.fr
|
478
cluster/prod/app/matrix/config/synapse/homeserver.yaml
Normal file
478
cluster/prod/app/matrix/config/synapse/homeserver.yaml
Normal file
|
@ -0,0 +1,478 @@
|
|||
# vim:ft=yaml
|
||||
|
||||
server_name: "deuxfleurs.fr"
|
||||
# PEM encoded X509 certificate for TLS.
|
||||
# You can replace the self-signed certificate that synapse
|
||||
# autogenerates on launch with your own SSL certificate + key pair
|
||||
# if you like. Any required intermediary certificates can be
|
||||
# appended after the primary certificate in hierarchical order.
|
||||
tls_certificate_path: "/etc/matrix-synapse/homeserver.tls.crt"
|
||||
|
||||
# PEM encoded private key for TLS
|
||||
tls_private_key_path: "/etc/matrix-synapse/homeserver.tls.key"
|
||||
|
||||
# PEM dh parameters for ephemeral keys
|
||||
tls_dh_params_path: "/etc/matrix-synapse/homeserver.tls.dh"
|
||||
|
||||
# Don't bind to the https port
|
||||
no_tls: True
|
||||
|
||||
|
||||
## Server ##
|
||||
|
||||
# When running as a daemon, the file to store the pid in
|
||||
pid_file: "/var/run/matrix-synapse.pid"
|
||||
|
||||
# Whether to serve a web client from the HTTP/HTTPS root resource.
|
||||
web_client: False
|
||||
|
||||
# The public-facing base URL for the client API (not including _matrix/...)
|
||||
public_baseurl: https://im.deuxfleurs.fr/
|
||||
|
||||
# Set the soft limit on the number of file descriptors synapse can use
|
||||
# Zero is used to indicate synapse should set the soft limit to the
|
||||
# hard limit.
|
||||
soft_file_limit: 0
|
||||
|
||||
# The GC threshold parameters to pass to `gc.set_threshold`, if defined
|
||||
# gc_thresholds: [700, 10, 10]
|
||||
|
||||
# A list of other Home Servers to fetch the public room directory from
|
||||
# and include in the public room directory of this home server
|
||||
# This is a temporary stopgap solution to populate new server with a
|
||||
# list of rooms until there exists a good solution of a decentralized
|
||||
# room directory.
|
||||
# secondary_directory_servers:
|
||||
# - matrix.org
|
||||
# - vector.im
|
||||
|
||||
# List of ports that Synapse should listen on, their purpose and their
|
||||
# configuration.
|
||||
listeners:
|
||||
# Unsecure HTTP listener,
|
||||
# For when matrix traffic passes through loadbalancer that unwraps TLS.
|
||||
- port: 8008
|
||||
tls: false
|
||||
bind_address: ''
|
||||
type: http
|
||||
|
||||
x_forwarded: false
|
||||
|
||||
resources:
|
||||
- names: [client, federation]
|
||||
compress: true
|
||||
|
||||
# Turn on the twisted ssh manhole service on localhost on the given
|
||||
# port.
|
||||
# - port: 9000
|
||||
# bind_address: 127.0.0.1
|
||||
# type: manhole
|
||||
|
||||
|
||||
# Database configuration
|
||||
database:
|
||||
name: psycopg2
|
||||
allow_unsafe_locale: false
|
||||
args:
|
||||
user: {{ key "secrets/chat/synapse/postgres_user" | trimSpace }}
|
||||
password: {{ key "secrets/chat/synapse/postgres_pwd" | trimSpace }}
|
||||
database: {{ key "secrets/chat/synapse/postgres_db" | trimSpace }}
|
||||
host: psql-proxy.service.prod.consul
|
||||
port: 5432
|
||||
cp_min: 5
|
||||
cp_max: 10
|
||||
# Number of events to cache in memory.
|
||||
event_cache_size: "10K"
|
||||
|
||||
|
||||
# A yaml python logging config file
|
||||
log_config: "/etc/matrix-synapse/log.yaml"
|
||||
|
||||
# Stop twisted from discarding the stack traces of exceptions in
|
||||
# deferreds by waiting a reactor tick before running a deferred's
|
||||
# callbacks.
|
||||
# full_twisted_stacktraces: true
|
||||
|
||||
|
||||
## Ratelimiting ##
|
||||
|
||||
# Number of messages a client can send per second
|
||||
rc_messages_per_second: 0.2
|
||||
|
||||
# Number of message a client can send before being throttled
|
||||
rc_message_burst_count: 10.0
|
||||
|
||||
# The federation window size in milliseconds
|
||||
federation_rc_window_size: 1000
|
||||
|
||||
# The number of federation requests from a single server in a window
|
||||
# before the server will delay processing the request.
|
||||
federation_rc_sleep_limit: 10
|
||||
|
||||
# The duration in milliseconds to delay processing events from
|
||||
# remote servers by if they go over the sleep limit.
|
||||
federation_rc_sleep_delay: 500
|
||||
|
||||
# The maximum number of concurrent federation requests allowed
|
||||
# from a single server
|
||||
federation_rc_reject_limit: 50
|
||||
|
||||
# The number of federation requests to concurrently process from a
|
||||
# single server
|
||||
federation_rc_concurrent: 3
|
||||
|
||||
|
||||
|
||||
# Directory where uploaded images and attachments are stored.
|
||||
media_store_path: "/var/lib/matrix-synapse/media"
|
||||
uploads_path: "/var/lib/matrix-synapse/uploads"
|
||||
|
||||
media_storage_providers:
|
||||
- module: s3_storage_provider.S3StorageProviderBackend
|
||||
store_local: True
|
||||
store_remote: True
|
||||
store_synchronous: True
|
||||
config:
|
||||
bucket: matrix
|
||||
# All of the below options are optional, for use with non-AWS S3-like
|
||||
# services, or to specify access tokens here instead of some external method.
|
||||
region_name: garage
|
||||
endpoint_url: https://garage.deuxfleurs.fr
|
||||
access_key_id: {{ key "secrets/chat/synapse/s3_access_key" | trimSpace }}
|
||||
secret_access_key: {{ key "secrets/chat/synapse/s3_secret_key" | trimSpace }}
|
||||
|
||||
# The object storage class used when uploading files to the bucket.
|
||||
# Default is STANDARD.
|
||||
#storage_class: "STANDARD_IA"
|
||||
|
||||
# The maximum number of concurrent threads which will be used to connect
|
||||
# to S3. Each thread manages a single connection. Default is 40.
|
||||
#
|
||||
#threadpool_size: 20
|
||||
|
||||
# The largest allowed upload size in bytes
|
||||
max_upload_size: "100M"
|
||||
|
||||
# Maximum number of pixels that will be thumbnailed
|
||||
max_image_pixels: "32M"
|
||||
|
||||
# Whether to generate new thumbnails on the fly to precisely match
|
||||
# the resolution requested by the client. If true then whenever
|
||||
# a new resolution is requested by the client the server will
|
||||
# generate a new thumbnail. If false the server will pick a thumbnail
|
||||
# from a precalculated list.
|
||||
dynamic_thumbnails: false
|
||||
|
||||
# List of thumbnail to precalculate when an image is uploaded.
|
||||
thumbnail_sizes:
|
||||
- width: 32
|
||||
height: 32
|
||||
method: crop
|
||||
- width: 96
|
||||
height: 96
|
||||
method: crop
|
||||
- width: 320
|
||||
height: 240
|
||||
method: scale
|
||||
- width: 640
|
||||
height: 480
|
||||
method: scale
|
||||
- width: 800
|
||||
height: 600
|
||||
method: scale
|
||||
|
||||
# Is the preview URL API enabled? If enabled, you *must* specify
|
||||
# an explicit url_preview_ip_range_blacklist of IPs that the spider is
|
||||
# denied from accessing.
|
||||
url_preview_enabled: True
|
||||
|
||||
# List of IP address CIDR ranges that the URL preview spider is denied
|
||||
# from accessing. There are no defaults: you must explicitly
|
||||
# specify a list for URL previewing to work. You should specify any
|
||||
# internal services in your network that you do not want synapse to try
|
||||
# to connect to, otherwise anyone in any Matrix room could cause your
|
||||
# synapse to issue arbitrary GET requests to your internal services,
|
||||
# causing serious security issues.
|
||||
#
|
||||
url_preview_ip_range_blacklist:
|
||||
- '127.0.0.0/8'
|
||||
- '10.0.0.0/8'
|
||||
- '172.16.0.0/12'
|
||||
- '192.168.0.0/16'
|
||||
#
|
||||
# List of IP address CIDR ranges that the URL preview spider is allowed
|
||||
# to access even if they are specified in url_preview_ip_range_blacklist.
|
||||
# This is useful for specifying exceptions to wide-ranging blacklisted
|
||||
# target IP ranges - e.g. for enabling URL previews for a specific private
|
||||
# website only visible in your network.
|
||||
#
|
||||
# url_preview_ip_range_whitelist:
|
||||
# - '192.168.1.1'
|
||||
|
||||
# Optional list of URL matches that the URL preview spider is
|
||||
# denied from accessing. You should use url_preview_ip_range_blacklist
|
||||
# in preference to this, otherwise someone could define a public DNS
|
||||
# entry that points to a private IP address and circumvent the blacklist.
|
||||
# This is more useful if you know there is an entire shape of URL that
|
||||
# you know that will never want synapse to try to spider.
|
||||
#
|
||||
# Each list entry is a dictionary of url component attributes as returned
|
||||
# by urlparse.urlsplit as applied to the absolute form of the URL. See
|
||||
# https://docs.python.org/2/library/urlparse.html#urlparse.urlsplit
|
||||
# The values of the dictionary are treated as an filename match pattern
|
||||
# applied to that component of URLs, unless they start with a ^ in which
|
||||
# case they are treated as a regular expression match. If all the
|
||||
# specified component matches for a given list item succeed, the URL is
|
||||
# blacklisted.
|
||||
#
|
||||
# url_preview_url_blacklist:
|
||||
# # blacklist any URL with a username in its URI
|
||||
# - username: '*'
|
||||
#
|
||||
# # blacklist all *.google.com URLs
|
||||
# - netloc: 'google.com'
|
||||
# - netloc: '*.google.com'
|
||||
#
|
||||
# # blacklist all plain HTTP URLs
|
||||
# - scheme: 'http'
|
||||
#
|
||||
# # blacklist http(s)://www.acme.com/foo
|
||||
# - netloc: 'www.acme.com'
|
||||
# path: '/foo'
|
||||
#
|
||||
# # blacklist any URL with a literal IPv4 address
|
||||
# - netloc: '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'
|
||||
|
||||
# The largest allowed URL preview spidering size in bytes
|
||||
max_spider_size: "10M"
|
||||
|
||||
|
||||
|
||||
|
||||
## Captcha ##
|
||||
|
||||
# This Home Server's ReCAPTCHA public key.
|
||||
recaptcha_public_key: "YOUR_PUBLIC_KEY"
|
||||
|
||||
# This Home Server's ReCAPTCHA private key.
|
||||
recaptcha_private_key: "YOUR_PRIVATE_KEY"
|
||||
|
||||
# Enables ReCaptcha checks when registering, preventing signup
|
||||
# unless a captcha is answered. Requires a valid ReCaptcha
|
||||
# public/private key.
|
||||
enable_registration_captcha: False
|
||||
|
||||
# A secret key used to bypass the captcha test entirely.
|
||||
#captcha_bypass_secret: "YOUR_SECRET_HERE"
|
||||
|
||||
# The API endpoint to use for verifying m.login.recaptcha responses.
|
||||
recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify"
|
||||
|
||||
|
||||
## Turn ##
|
||||
|
||||
# The public URIs of the TURN server to give to clients
|
||||
#turn_uris: [ "turn:turn.deuxfleurs.fr:3478?transport=udp", "turn:turn.deuxfleurs.fr:3478?transport=tcp" ]
|
||||
|
||||
# The shared secret used to compute passwords for the TURN server
|
||||
#turn_shared_secret: 'change me'
|
||||
|
||||
# How long generated TURN credentials last
|
||||
turn_user_lifetime: "1h"
|
||||
|
||||
turn_allow_guests: True
|
||||
|
||||
## Registration ##
|
||||
|
||||
# Enable registration for new users.
|
||||
enable_registration: False
|
||||
|
||||
# If set, allows registration by anyone who also has the shared
|
||||
# secret, even if registration is otherwise disabled.
|
||||
registration_shared_secret: '{{ key "secrets/chat/synapse/registration_shared_secret" | trimSpace }}'
|
||||
|
||||
# Sets the expiry for the short term user creation in
|
||||
# milliseconds. For instance the bellow duration is two weeks
|
||||
# in milliseconds.
|
||||
user_creation_max_duration: 1209600000
|
||||
|
||||
# Set the number of bcrypt rounds used to generate password hash.
|
||||
# Larger numbers increase the work factor needed to generate the hash.
|
||||
# The default number of rounds is 12.
|
||||
bcrypt_rounds: 12
|
||||
|
||||
# Allows users to register as guests without a password/email/etc, and
|
||||
# participate in rooms hosted on this server which have been made
|
||||
# accessible to anonymous users.
|
||||
allow_guest_access: False
|
||||
|
||||
# The list of identity servers trusted to verify third party
|
||||
# identifiers by this server.
|
||||
trusted_third_party_id_servers:
|
||||
- matrix.org
|
||||
- vector.im
|
||||
|
||||
|
||||
## Metrics ###
|
||||
|
||||
# Enable collection and rendering of performance metrics
|
||||
enable_metrics: False
|
||||
|
||||
## API Configuration ##
|
||||
|
||||
# A list of event types that will be included in the room_invite_state
|
||||
#room_invite_state_types:
|
||||
# - "m.room.join_rules"
|
||||
# - "m.room.canonical_alias"
|
||||
# - "m.room.avatar"
|
||||
# - "m.room.name"
|
||||
|
||||
# Controls for the state that is shared with users who receive an invite
|
||||
# to a room
|
||||
#
|
||||
room_prejoin_state:
|
||||
# By default, the following state event types are shared with users who
|
||||
# receive invites to the room:
|
||||
#
|
||||
# - m.room.join_rules
|
||||
# - m.room.canonical_alias
|
||||
# - m.room.avatar
|
||||
# - m.room.encryption
|
||||
# - m.room.name
|
||||
# - m.room.create
|
||||
#
|
||||
# Uncomment the following to disable these defaults (so that only the event
|
||||
# types listed in 'additional_event_types' are shared). Defaults to 'false'.
|
||||
#
|
||||
#disable_default_event_types: true
|
||||
|
||||
# Additional state event types to share with users when they are invited
|
||||
# to a room.
|
||||
#
|
||||
# By default, this list is empty (so only the default event types are shared).
|
||||
#
|
||||
#additional_event_types:
|
||||
# - org.example.custom.event.type
|
||||
|
||||
|
||||
# A list of application service config file to use
|
||||
app_service_config_files:
|
||||
#- "/etc/matrix-synapse/easybridge_registration.yaml"
|
||||
#- "/etc/matrix-synapse/fb2mx_registration.yaml"
|
||||
|
||||
|
||||
# macaroon_secret_key: <PRIVATE STRING>
|
||||
|
||||
# Used to enable access token expiration.
|
||||
expire_access_token: False
|
||||
|
||||
## Signing Keys ##
|
||||
|
||||
# Path to the signing key to sign messages with
|
||||
signing_key_path: "/etc/matrix-synapse/homeserver.signing.key"
|
||||
|
||||
# The keys that the server used to sign messages with but won't use
|
||||
# to sign new messages. E.g. it has lost its private key
|
||||
old_signing_keys: {}
|
||||
# "ed25519:auto":
|
||||
# # Base64 encoded public key
|
||||
# key: "The public part of your old signing key."
|
||||
# # Millisecond POSIX timestamp when the key expired.
|
||||
# expired_ts: 123456789123
|
||||
|
||||
# How long key response published by this server is valid for.
|
||||
# Used to set the valid_until_ts in /key/v2 APIs.
|
||||
# Determines how quickly servers will query to check which keys
|
||||
# are still valid.
|
||||
key_refresh_interval: "1d" # 1 Day.
|
||||
|
||||
# The trusted servers to download signing keys from.
|
||||
perspectives:
|
||||
servers:
|
||||
"matrix.org":
|
||||
verify_keys:
|
||||
"ed25519:auto":
|
||||
key: "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"
|
||||
|
||||
|
||||
|
||||
# Enable SAML2 for registration and login. Uses pysaml2
|
||||
# config_path: Path to the sp_conf.py configuration file
|
||||
# idp_redirect_url: Identity provider URL which will redirect
|
||||
# the user back to /login/saml2 with proper info.
|
||||
# See pysaml2 docs for format of config.
|
||||
#saml2_config:
|
||||
# enabled: true
|
||||
# config_path: "/home/erikj/git/synapse/sp_conf.py"
|
||||
# idp_redirect_url: "http://test/idp"
|
||||
|
||||
|
||||
|
||||
# Enable CAS for registration and login.
|
||||
#cas_config:
|
||||
# enabled: true
|
||||
# server_url: "https://cas-server.com"
|
||||
# service_url: "https://homesever.domain.com:8448"
|
||||
# #required_attributes:
|
||||
# # name: value
|
||||
|
||||
|
||||
# The JWT needs to contain a globally unique "sub" (subject) claim.
|
||||
#
|
||||
# jwt_config:
|
||||
# enabled: true
|
||||
# secret: "a secret"
|
||||
# algorithm: "HS256"
|
||||
|
||||
password_providers:
|
||||
- module: "ldap_auth_provider.LdapAuthProvider"
|
||||
config:
|
||||
enabled: true
|
||||
uri: "ldap://bottin2.service.2.cluster.deuxfleurs.fr:389"
|
||||
start_tls: false
|
||||
bind_dn: '{{ key "secrets/chat/synapse/ldap_binddn" | trimSpace }}'
|
||||
bind_password: '{{ key "secrets/chat/synapse/ldap_bindpw" | trimSpace }}'
|
||||
base: "ou=users,dc=deuxfleurs,dc=fr"
|
||||
attributes:
|
||||
uid: "cn"
|
||||
name: "displayName"
|
||||
mail: "mail"
|
||||
|
||||
# Enable password for login.
|
||||
password_config:
|
||||
enabled: true
|
||||
|
||||
# Enable sending emails for notification events
|
||||
#email:
|
||||
# enable_notifs: false
|
||||
# smtp_host: "localhost"
|
||||
# smtp_port: 25
|
||||
# notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>"
|
||||
# app_name: Matrix
|
||||
# template_dir: res/templates
|
||||
# notif_template_html: notif_mail.html
|
||||
# notif_template_text: notif_mail.txt
|
||||
# notif_for_new_users: True
|
||||
|
||||
# Key that had to be added after some synapse updates to please matrix developers...
|
||||
report_stats: false
|
||||
suppress_key_server_warning: true
|
||||
enable_group_creation: true
|
||||
|
||||
#experimental_features:
|
||||
# spaces_enabled: true
|
||||
|
||||
presence:
|
||||
enabled: false
|
||||
limit_remote_rooms:
|
||||
enabled: true
|
||||
complexity: 3.0
|
||||
complexity_error: "Ce salon de discussion a trop d'activité, le serveur n'est pas assez puissant pour le rejoindre. N'hésitez pas à remonter l'information à l'équipe technique, nous pourrons ajuster la limitation au besoin."
|
||||
admins_can_join: false
|
||||
retention:
|
||||
enabled: true
|
||||
# no default policy for now, this is intended.
|
||||
# DO NOT ADD ONE BECAUSE THIS IS DANGEROUS AND WILL DELETE CONTENT WE WANT TO KEEP!
|
||||
purge_jobs:
|
||||
- interval: 1d
|
||||
|
41
cluster/prod/app/matrix/config/synapse/log.yaml
Normal file
41
cluster/prod/app/matrix/config/synapse/log.yaml
Normal file
|
@ -0,0 +1,41 @@
|
|||
|
||||
version: 1
|
||||
|
||||
formatters:
|
||||
precise:
|
||||
format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s- %(message)s'
|
||||
|
||||
filters:
|
||||
context:
|
||||
(): synapse.util.logcontext.LoggingContextFilter
|
||||
request: ""
|
||||
|
||||
handlers:
|
||||
file:
|
||||
class: logging.handlers.RotatingFileHandler
|
||||
formatter: precise
|
||||
filename: /var/log/matrix-synapse/homeserver.log
|
||||
maxBytes: 10485760
|
||||
backupCount: 3
|
||||
filters: [context]
|
||||
level: WARN
|
||||
console:
|
||||
class: logging.StreamHandler
|
||||
formatter: precise
|
||||
level: WARN
|
||||
|
||||
loggers:
|
||||
synapse:
|
||||
level: INFO
|
||||
|
||||
synapse.storage.SQL:
|
||||
level: INFO
|
||||
|
||||
ldap3:
|
||||
level: DEBUG
|
||||
ldap_auth_provider:
|
||||
level: DEBUG
|
||||
|
||||
root:
|
||||
level: INFO
|
||||
handlers: [file, console]
|
200
cluster/prod/app/matrix/deploy/im.hcl
Normal file
200
cluster/prod/app/matrix/deploy/im.hcl
Normal file
|
@ -0,0 +1,200 @@
|
|||
job "matrix" {
|
||||
datacenters = ["orion"]
|
||||
type = "service"
|
||||
priority = 60
|
||||
|
||||
group "matrix" {
|
||||
count = 1
|
||||
|
||||
network {
|
||||
port "api_port" { static = 8008 }
|
||||
}
|
||||
|
||||
task "synapse" {
|
||||
driver = "docker"
|
||||
|
||||
config {
|
||||
image = "superboum/amd64_synapse:v54"
|
||||
network_mode = "host"
|
||||
readonly_rootfs = true
|
||||
ports = [ "api_port" ]
|
||||
command = "python"
|
||||
args = [
|
||||
"-m", "synapse.app.homeserver",
|
||||
"-n",
|
||||
"-c", "/etc/matrix-synapse/homeserver.yaml"
|
||||
]
|
||||
volumes = [
|
||||
"secrets/conf:/etc/matrix-synapse",
|
||||
"/tmp/synapse-media:/var/lib/matrix-synapse/media",
|
||||
"/tmp/synapse-uploads:/var/lib/matrix-synapse/uploads",
|
||||
"/tmp/synapse-logs:/var/log/matrix-synapse",
|
||||
"/tmp/synapse:/tmp"
|
||||
]
|
||||
}
|
||||
|
||||
template {
|
||||
data = file("../config/synapse/homeserver.yaml")
|
||||
destination = "secrets/conf/homeserver.yaml"
|
||||
}
|
||||
|
||||
template {
|
||||
data = file("../config/synapse/log.yaml")
|
||||
destination = "secrets/conf/log.yaml"
|
||||
}
|
||||
|
||||
template {
|
||||
data = file("../config/synapse/conf.d/server_name.yaml")
|
||||
destination = "secrets/conf/server_name.yaml"
|
||||
}
|
||||
|
||||
template {
|
||||
data = file("../config/synapse/conf.d/report_stats.yaml")
|
||||
destination = "secrets/conf/report_stats.yaml"
|
||||
}
|
||||
|
||||
# --- secrets ---
|
||||
template {
|
||||
data = "{{ key \"secrets/chat/synapse/homeserver.tls.crt\" }}"
|
||||
destination = "secrets/conf/homeserver.tls.crt"
|
||||
}
|
||||
|
||||
template {
|
||||
data = "{{ key \"secrets/chat/synapse/homeserver.tls.dh\" }}"
|
||||
destination = "secrets/conf/homeserver.tls.dh"
|
||||
}
|
||||
|
||||
template {
|
||||
data = "{{ key \"secrets/chat/synapse/homeserver.tls.key\" }}"
|
||||
destination = "secrets/conf/homeserver.tls.key"
|
||||
}
|
||||
|
||||
template {
|
||||
data = "{{ key \"secrets/chat/synapse/homeserver.signing.key\" }}"
|
||||
destination = "secrets/conf/homeserver.signing.key"
|
||||
}
|
||||
|
||||
env {
|
||||
SYNAPSE_CACHE_FACTOR = 1
|
||||
}
|
||||
|
||||
resources {
|
||||
cpu = 1000
|
||||
memory = 1000
|
||||
}
|
||||
|
||||
service {
|
||||
name = "synapse"
|
||||
port = "api_port"
|
||||
address_mode = "host"
|
||||
tags = [
|
||||
"matrix",
|
||||
"tricot im.deuxfleurs.fr/_matrix 100",
|
||||
"tricot im.deuxfleurs.fr:443/_matrix 100",
|
||||
"tricot im.deuxfleurs.fr/_synapse 100",
|
||||
"tricot-add-header Access-Control-Allow-Origin *",
|
||||
]
|
||||
check {
|
||||
type = "tcp"
|
||||
port = "api_port"
|
||||
interval = "60s"
|
||||
timeout = "5s"
|
||||
check_restart {
|
||||
limit = 3
|
||||
grace = "90s"
|
||||
ignore_warnings = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
task "media-async-upload" {
|
||||
driver = "docker"
|
||||
|
||||
config {
|
||||
image = "superboum/amd64_synapse:v54"
|
||||
readonly_rootfs = true
|
||||
command = "/usr/local/bin/matrix-s3-async"
|
||||
work_dir = "/tmp"
|
||||
volumes = [
|
||||
"/tmp/synapse-media:/var/lib/matrix-synapse/media",
|
||||
"/tmp/synapse-uploads:/var/lib/matrix-synapse/uploads",
|
||||
"/tmp/synapse:/tmp"
|
||||
]
|
||||
}
|
||||
|
||||
resources {
|
||||
cpu = 100
|
||||
memory = 100
|
||||
}
|
||||
|
||||
template {
|
||||
data = <<EOH
|
||||
AWS_ACCESS_KEY_ID={{ key "secrets/chat/synapse/s3_access_key" | trimSpace }}
|
||||
AWS_SECRET_ACCESS_KEY={{ key "secrets/chat/synapse/s3_secret_key" | trimSpace }}
|
||||
AWS_DEFAULT_REGION=garage
|
||||
PG_USER={{ key "secrets/chat/synapse/postgres_user" | trimSpace }}
|
||||
PG_PASS={{ key "secrets/chat/synapse/postgres_pwd" | trimSpace }}
|
||||
PG_DB={{ key "secrets/chat/synapse/postgres_db" | trimSpace }}
|
||||
PG_HOST=psql-proxy.service.2.cluster.deuxfleurs.fr
|
||||
PG_PORT=5432
|
||||
EOH
|
||||
destination = "secrets/env"
|
||||
env = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
group "riotweb" {
|
||||
count = 1
|
||||
|
||||
network {
|
||||
port "web_port" { to = 8043 }
|
||||
}
|
||||
|
||||
task "server" {
|
||||
driver = "docker"
|
||||
config {
|
||||
image = "superboum/amd64_riotweb:v31"
|
||||
ports = [ "web_port" ]
|
||||
volumes = [
|
||||
"secrets/config.json:/srv/http/config.json"
|
||||
]
|
||||
}
|
||||
|
||||
template {
|
||||
data = file("../config/riot_web/config.json")
|
||||
destination = "secrets/config.json"
|
||||
}
|
||||
|
||||
resources {
|
||||
memory = 21
|
||||
}
|
||||
|
||||
service {
|
||||
tags = [
|
||||
"webstatic",
|
||||
"tricot im.deuxfleurs.fr 10",
|
||||
"tricot riot.deuxfleurs.fr 10",
|
||||
]
|
||||
port = "web_port"
|
||||
address_mode = "host"
|
||||
name = "webstatic"
|
||||
check {
|
||||
type = "tcp"
|
||||
port = "web_port"
|
||||
interval = "60s"
|
||||
timeout = "5s"
|
||||
check_restart {
|
||||
limit = 3
|
||||
grace = "90s"
|
||||
ignore_warnings = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
1
cluster/prod/app/matrix/secrets/chat/coturn/static-auth
Normal file
1
cluster/prod/app/matrix/secrets/chat/coturn/static-auth
Normal file
|
@ -0,0 +1 @@
|
|||
USER coturn static-auth (what is this?)
|
|
@ -0,0 +1 @@
|
|||
USER Serveur coturn (TURN/STUN) d'Adrien, c'est un jeton d'identification.
|
1
cluster/prod/app/matrix/secrets/chat/easybridge/as_token
Normal file
1
cluster/prod/app/matrix/secrets/chat/easybridge/as_token
Normal file
|
@ -0,0 +1 @@
|
|||
CMD openssl rand -hex 32
|
1
cluster/prod/app/matrix/secrets/chat/easybridge/db_pass
Normal file
1
cluster/prod/app/matrix/secrets/chat/easybridge/db_pass
Normal file
|
@ -0,0 +1 @@
|
|||
SERVICE_PASSWORD easybridge
|
1
cluster/prod/app/matrix/secrets/chat/easybridge/db_user
Normal file
1
cluster/prod/app/matrix/secrets/chat/easybridge/db_user
Normal file
|
@ -0,0 +1 @@
|
|||
CONST easybridge
|
1
cluster/prod/app/matrix/secrets/chat/easybridge/hs_token
Normal file
1
cluster/prod/app/matrix/secrets/chat/easybridge/hs_token
Normal file
|
@ -0,0 +1 @@
|
|||
CMD openssl rand -hex 32
|
|
@ -0,0 +1,2 @@
|
|||
CMD openssl rand -hex 32
|
||||
|
1
cluster/prod/app/matrix/secrets/chat/fb2mx/as_token
Normal file
1
cluster/prod/app/matrix/secrets/chat/fb2mx/as_token
Normal file
|
@ -0,0 +1 @@
|
|||
CMD openssl rand -hex 32
|
1
cluster/prod/app/matrix/secrets/chat/fb2mx/db_url
Normal file
1
cluster/prod/app/matrix/secrets/chat/fb2mx/db_url
Normal file
|
@ -0,0 +1 @@
|
|||
USER fb2mx database URL, format: postgres://username:password@hostname/dbname
|
1
cluster/prod/app/matrix/secrets/chat/fb2mx/hs_token
Normal file
1
cluster/prod/app/matrix/secrets/chat/fb2mx/hs_token
Normal file
|
@ -0,0 +1 @@
|
|||
CMD openssl rand -hex 32
|
|
@ -0,0 +1 @@
|
|||
USER Synapse homeserver ed25519 signing key
|
|
@ -0,0 +1 @@
|
|||
SSL_CERT synapse im.deuxfleurs.fr
|
|
@ -0,0 +1 @@
|
|||
USER_LONG DH parameters for matrix ssl key? how does this work?
|
|
@ -0,0 +1 @@
|
|||
SSL_KEY synapse im.deuxfleurs.fr
|
1
cluster/prod/app/matrix/secrets/chat/synapse/ldap_binddn
Normal file
1
cluster/prod/app/matrix/secrets/chat/synapse/ldap_binddn
Normal file
|
@ -0,0 +1 @@
|
|||
SERVICE_DN matrix Matrix chat server
|
1
cluster/prod/app/matrix/secrets/chat/synapse/ldap_bindpw
Normal file
1
cluster/prod/app/matrix/secrets/chat/synapse/ldap_bindpw
Normal file
|
@ -0,0 +1 @@
|
|||
SERVICE_PASSWORD matrix
|
1
cluster/prod/app/matrix/secrets/chat/synapse/postgres_db
Normal file
1
cluster/prod/app/matrix/secrets/chat/synapse/postgres_db
Normal file
|
@ -0,0 +1 @@
|
|||
CONST synapse
|
|
@ -0,0 +1 @@
|
|||
SERVICE_PASSWORD matrix
|
|
@ -0,0 +1 @@
|
|||
CONST matrix
|
|
@ -0,0 +1 @@
|
|||
CMD head -c 32 /dev/urandom | base64
|
|
@ -0,0 +1 @@
|
|||
USER matrix
|
|
@ -0,0 +1 @@
|
|||
USER matrix
|
|
@ -22,7 +22,7 @@ ROCKET_PORT={{ env "NOMAD_PORT_web_port" }}
|
|||
MEDIA_UPLOAD_DIRECTORY=/app/static/media
|
||||
SEARCH_INDEX=/app/search_index
|
||||
|
||||
LDAP_ADDR=ldap://bottin.service.prod.consul:389
|
||||
LDAP_ADDR=ldap://{{ env "meta.site" }}.bottin.service.prod.consul:389
|
||||
LDAP_BASE_DN=ou=users,dc=deuxfleurs,dc=fr
|
||||
LDAP_USER_NAME_ATTR=cn
|
||||
LDAP_USER_MAIL_ATTR=mail
|
||||
|
|
|
@ -18,7 +18,7 @@ job "plume-blog" {
|
|||
constraint {
|
||||
attribute = "${attr.unique.hostname}"
|
||||
operator = "="
|
||||
value = "digitale"
|
||||
value = "dahlia"
|
||||
}
|
||||
|
||||
driver = "docker"
|
||||
|
@ -49,9 +49,6 @@ job "plume-blog" {
|
|||
name = "plume"
|
||||
tags = [
|
||||
"plume",
|
||||
"traefik.enable=true",
|
||||
"traefik.frontend.entryPoints=https,http",
|
||||
"traefik.frontend.rule=Host:plume.deuxfleurs.fr",
|
||||
"tricot plume.deuxfleurs.fr",
|
||||
]
|
||||
port = "web_port"
|
||||
|
|
|
@ -172,7 +172,7 @@ job "postgres14" {
|
|||
}
|
||||
|
||||
resources {
|
||||
memory = 1000
|
||||
memory = 600
|
||||
}
|
||||
|
||||
service {
|
||||
|
|
Loading…
Reference in a new issue