diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-01-19 14:24:44 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-01-19 14:24:44 +0100 |
| commit | 3c12cf646373cb66c3eb0a9b0dbb3f12534dd69a (patch) | |
| tree | 2e6e931faef312bf6e6cdbef33f2944a8a5cde2d /app/im/build | |
| parent | b5ec581bc8404ff993910e4ba28df564b0e15c02 (diff) | |
| download | nixcfg-3c12cf646373cb66c3eb0a9b0dbb3f12534dd69a.tar.gz nixcfg-3c12cf646373cb66c3eb0a9b0dbb3f12534dd69a.zip | |
im: directly call Garage on local node when possible
Diffstat (limited to 'app/im/build')
| -rw-r--r-- | app/im/build/matrix-synapse/Dockerfile | 2 | ||||
| -rwxr-xr-x | app/im/build/matrix-synapse/matrix-s3-async-sqlite | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/im/build/matrix-synapse/Dockerfile b/app/im/build/matrix-synapse/Dockerfile index 4388d88..0496b19 100644 --- a/app/im/build/matrix-synapse/Dockerfile +++ b/app/im/build/matrix-synapse/Dockerfile @@ -27,7 +27,7 @@ RUN . /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/Alexis211/synapse-s3-storage-provider.git@${S3_VERSION} + git+https://github.com/matrix-org/synapse-s3-storage-provider.git@${S3_VERSION} FROM amd64/debian:buster diff --git a/app/im/build/matrix-synapse/matrix-s3-async-sqlite b/app/im/build/matrix-synapse/matrix-s3-async-sqlite index 8ab205e..4bba072 100755 --- a/app/im/build/matrix-synapse/matrix-s3-async-sqlite +++ b/app/im/build/matrix-synapse/matrix-s3-async-sqlite @@ -2,12 +2,12 @@ cat > database.yaml <<EOF sqlite: - database: /ephemeral/homeserver.db + database: $SYNAPSE_SQLITE_DB 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 /ephemeral/media_store - /root/matrix-env/bin/s3_media_upload --no-progress upload /ephemeral/media_store synapse-data --delete --endpoint-url https://garage-staging.home.adnab.me + /root/matrix-env/bin/s3_media_upload --no-progress check-deleted $SYNAPSE_MEDIA_STORE + /root/matrix-env/bin/s3_media_upload --no-progress upload $SYNAPSE_MEDIA_STORE $SYNAPSE_MEDIA_S3_BUCKET --delete --endpoint-url $S3_ENDPOINT sleep 600 done |