finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #132 from console-cowboy/goofys-custom-endpoint

Browse Source 
Goofys Custom Endpoint Support
This commit is contained in:
Slavi Pantaleev 2019-04-05 14:19:24 +03:00 committed by GitHub
commit 590a26a6ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/matrix-synapse/defaults/main.yml
View File

@ -218,7 +218,9 @@ matrix_synapse_ext_password_provider_ldap_filter: ""
matrix_s3_media_store_enabled: false matrix_s3_media_store_enabled: false
matrix_s3_media_store_custom_endpoint_enabled: false
matrix_s3_goofys_docker_image: "ewoutp/goofys:latest" matrix_s3_goofys_docker_image: "ewoutp/goofys:latest"
matrix_s3_media_store_custom_endpoint: "your-custom-endpoint"
matrix_s3_media_store_bucket_name: "your-bucket-name" matrix_s3_media_store_bucket_name: "your-bucket-name"
matrix_s3_media_store_aws_access_key: "your-aws-access-key" matrix_s3_media_store_aws_access_key: "your-aws-access-key"
matrix_s3_media_store_aws_secret_key: "your-aws-secret-key" matrix_s3_media_store_aws_secret_key: "your-aws-secret-key"

2
roles/matrix-synapse/templates/goofys/env-goofys.j2
View File

@ -1,2 +1,2 @@
AWS_ACCESS_KEY={{ matrix_s3_media_store_aws_access_key }} AWS_ACCESS_KEY={{ matrix_s3_media_store_aws_access_key }}
AWS_SECRET_KEY={{ matrix_s3_media_store_aws_secret_key }} AWS_SECRET_KEY={{ matrix_s3_media_store_aws_secret_key }}

2
roles/matrix-synapse/templates/goofys/systemd/matrix-goofys.service.j2
View File

@ -20,7 +20,7 @@ ExecStart=/usr/bin/docker run --rm --name %n \
--env-file={{ matrix_synapse_config_dir_path }}/env-goofys \ --env-file={{ matrix_synapse_config_dir_path }}/env-goofys \
--entrypoint /bin/sh \ --entrypoint /bin/sh \
{{ matrix_s3_goofys_docker_image }} \ {{ matrix_s3_goofys_docker_image }} \
-c 'goofys -f --storage-class=STANDARD_IA --region {{ matrix_s3_media_store_region }} --stat-cache-ttl 60m0s --type-cache-ttl 60m0s --dir-mode 0700 --file-mode 0700 {{ matrix_s3_media_store_bucket_name }} /s3' -c 'goofys -f{% if matrix_s3_media_store_custom_endpoint_enabled is false %} --storage-class=STANDARD_IA{% endif %}{% matrix_s3_media_store_custom_endpoint_enabled %} --endpoint={{ matrix_s3_media_store_custom_endpoint }}{% endif %} --region {{ matrix_s3_media_store_region }} --stat-cache-ttl 60m0s --type-cache-ttl 60m0s --dir-mode 0700 --file-mode 0700 {{ matrix_s3_media_store_bucket_name }} /s3'
TimeoutStartSec=5min TimeoutStartSec=5min
ExecStop=-/usr/bin/docker stop %n ExecStop=-/usr/bin/docker stop %n
ExecStop=-/usr/bin/docker kill %n ExecStop=-/usr/bin/docker kill %n