made the bridge use the default postgres db

This commit is contained in:
Sabine Laszakovits
2021-01-02 00:39:11 +01:00
parent a06c58c753
commit ffb837d4bc
7 changed files with 39 additions and 88 deletions

View File

@ -27,7 +27,7 @@ appservice:
max_body_size: 1
# The full URI to the database. Only Postgres is currently supported.
database: {{ matrix_mautrix_signal_db_url }}
database: {{ matrix_mautrix_signal_database_connection_string }}
# Provisioning API part of the web server for automated portal creation and fetching information.
# Used by things like mautrix-manager (https://github.com/tulir/mautrix-manager).

View File

@ -1,33 +0,0 @@
#jinja2: lstrip_blocks: "True"
[Unit]
Description=Matrix Mautrix Signal database server
[Service]
Type=simple
ExecStartPre=-{{ matrix_host_command_docker }} kill {{ matrix_mautrix_signal_db_host }}
ExecStartPre=-{{ matrix_host_command_docker }} rm {{ matrix_mautrix_signal_db_host }}
# Intentional delay, so that the homeserver (we likely depend on) can manage to start.
ExecStartPre={{ matrix_host_command_sleep }} 5
ExecStart={{ matrix_host_command_docker }} run --rm --name {{ matrix_mautrix_signal_db_host }} \
--log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--network={{ matrix_docker_network }} \
--env POSTGRES_USER={{ matrix_mautrix_signal_db_user }} \
--env POSTGRES_PASSWORD={{ matrix_mautrix_signal_db_password }} \
--env POSTGRES_DB={{ matrix_mautrix_signal_db_database }} \
-v {{ matrix_mautrix_signal_db_storage_path }}:/var/lib/postgresql/data:z \
-v /etc/passwd:/etc/passwd:ro \
{{ matrix_mautrix_signal_db_docker_image }}
ExecStop=-{{ matrix_host_command_docker }} kill {{ matrix_mautrix_signal_db_host }}
ExecStop=-{{ matrix_host_command_docker }} rm {{ matrix_mautrix_signal_db_host }}
Restart=always
RestartSec=30
SyslogIdentifier=matrix-mautrix-signal-db
[Install]
WantedBy=multi-user.target