Compare commits

..

8 Commits

Author SHA1 Message Date
aee5ef4c63
feat: add automatic creation of reverse-proxy routing 2021-08-11 06:06:15 +02:00
dd217464fc
meta: move inventory structure to be more usable 2021-08-11 06:06:14 +02:00
724ccdc7c8
meta: add own inventory, add vault-unlock with GPG 2021-08-11 06:06:13 +02:00
Slavi Pantaleev
e27539ad60
Merge pull request #1226 from hifi/feature/synapse-txn-limit
Allow configuring synapse database transaction limit
2021-08-10 21:54:23 +03:00
Toni Spets
bce94c5860 Allow configuring synapse database transaction limit 2021-08-10 21:09:28 +03:00
Slavi Pantaleev
05ad620386 Update homeserver.yaml to keep up with Synapse v1.40.0
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1225
2021-08-10 17:36:44 +03:00
Slavi Pantaleev
c5d64f4dda
Merge pull request #1225 from wol-win/update_synapse
Update Synapse (1.39.0 -> 1.40.0)
2021-08-10 17:33:47 +03:00
WobbelTheBear
2469ada520
Update Synapse (1.39.0 -> 1.40.0) 2021-08-10 15:32:07 +02:00
2 changed files with 46 additions and 2 deletions

View File

@ -15,8 +15,8 @@ matrix_synapse_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_cont
# amd64 gets released first. # amd64 gets released first.
# arm32 relies on self-building, so the same version can be built immediately. # arm32 relies on self-building, so the same version can be built immediately.
# arm64 users need to wait for a prebuilt image to become available. # arm64 users need to wait for a prebuilt image to become available.
matrix_synapse_version: v1.39.0 matrix_synapse_version: v1.40.0
matrix_synapse_version_arm64: v1.39.0 matrix_synapse_version_arm64: v1.40.0
matrix_synapse_docker_image_tag: "{{ matrix_synapse_version if matrix_architecture in ['arm32', 'amd64'] else matrix_synapse_version_arm64 }}" matrix_synapse_docker_image_tag: "{{ matrix_synapse_version if matrix_architecture in ['arm32', 'amd64'] else matrix_synapse_version_arm64 }}"
matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}" matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"
@ -453,6 +453,7 @@ matrix_synapse_replication_http_port: 9093
matrix_synapse_sentry_dsn: "" matrix_synapse_sentry_dsn: ""
# Postgres database information # Postgres database information
matrix_synapse_database_txn_limit: 0
matrix_synapse_database_host: "matrix-postgres" matrix_synapse_database_host: "matrix-postgres"
matrix_synapse_database_port: 5432 matrix_synapse_database_port: 5432
matrix_synapse_database_user: "synapse" matrix_synapse_database_user: "synapse"

View File

@ -732,9 +732,52 @@ caches:
## Database ## ## Database ##
# The 'database' setting defines the database that synapse uses to store all of
# its data.
#
# 'name' gives the database engine to use: either 'sqlite3' (for SQLite) or
# 'psycopg2' (for PostgreSQL).
#
# 'txn_limit' gives the maximum number of transactions to run per connection
# before reconnecting. Defaults to 0, which means no limit.
#
# 'args' gives options which are passed through to the database engine,
# except for options starting 'cp_', which are used to configure the Twisted
# connection pool. For a reference to valid arguments, see:
# * for sqlite: https://docs.python.org/3/library/sqlite3.html#sqlite3.connect
# * for postgres: https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-PARAMKEYWORDS
# * for the connection pool: https://twistedmatrix.com/documents/current/api/twisted.enterprise.adbapi.ConnectionPool.html#__init__
#
#
# Example SQLite configuration:
#
#database:
# name: sqlite3
# args:
# database: /path/to/homeserver.db
#
#
# Example Postgres configuration:
#
#database:
# name: psycopg2
# txn_limit: 10000
# args:
# user: synapse_user
# password: secretpassword
# database: synapse
# host: localhost
# port: 5432
# cp_min: 5
# cp_max: 10
#
# For more information on using Synapse with Postgres,
# see https://matrix-org.github.io/synapse/latest/postgres.html.
#
database: database:
# The database engine name # The database engine name
name: "psycopg2" name: "psycopg2"
txn_limit: {{ matrix_synapse_database_txn_limit }}
args: args:
user: {{ matrix_synapse_database_user|string|to_json }} user: {{ matrix_synapse_database_user|string|to_json }}
password: {{ matrix_synapse_database_password|string|to_json }} password: {{ matrix_synapse_database_password|string|to_json }}