mirror of
				https://github.com/spantaleev/matrix-docker-ansible-deploy.git
				synced 2025-10-26 13:00:41 +01:00 
			
		
		
		
	Commit 4224741130 missed a endfor
statement in the goofys systemd service unit template. This adds it,
avoiding a Jinja2 syntax error when using goofys.
		
	
		
			
				
	
	
		
			45 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Django/Jinja
		
	
	
	
	
	
			
		
		
	
	
			45 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Django/Jinja
		
	
	
	
	
	
| #jinja2: lstrip_blocks: "True"
 | |
| [Unit]
 | |
| Description=Matrix Goofys media store
 | |
| {% for service in matrix_synapse_goofys_systemd_required_services_list %}
 | |
| Requires={{ service }}
 | |
| After={{ service }}
 | |
| {% endfor %}
 | |
| DefaultDependencies=no
 | |
| 
 | |
| [Service]
 | |
| Type=simple
 | |
| Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
 | |
| ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} %n
 | |
| ExecStartPre=-{{ devture_systemd_docker_base_host_command_docker }} rm %n
 | |
| 
 | |
| ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name %n \
 | |
| 			--log-driver=none \
 | |
| 			--user={{ matrix_synapse_uid }}:{{ matrix_synapse_gid }} \
 | |
| 			--mount type=bind,src=/etc/passwd,dst=/etc/passwd,ro \
 | |
| 			--mount type=bind,src=/etc/group,dst=/etc/group,ro \
 | |
| 			--mount type=bind,src={{ matrix_s3_media_store_path }},dst=/s3,bind-propagation=shared \
 | |
| 			--security-opt apparmor=unconfined \
 | |
| 			--cap-add mknod \
 | |
| 			--cap-add sys_admin \
 | |
| 			--device=/dev/fuse \
 | |
| 			--env-file={{ matrix_synapse_config_dir_path }}/env-goofys \
 | |
| 			--entrypoint /bin/sh \
 | |
| 			{{ matrix_s3_goofys_docker_image }} \
 | |
| 			-c 'goofys -f{% if not matrix_s3_media_store_custom_endpoint_enabled %} --storage-class=STANDARD_IA{% endif %}{% if 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'
 | |
| 
 | |
| # Allow for some time before starting, so that this can start and media is fully mountable.
 | |
| ExecStartPost={{ matrix_host_command_sleep }} 3
 | |
| 
 | |
| TimeoutStartSec=5min
 | |
| ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} stop %n
 | |
| ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} %n
 | |
| ExecStop=-{{ devture_systemd_docker_base_host_command_docker }} rm %n
 | |
| ExecStop=-{{ matrix_host_command_fusermount }} -u {{ matrix_s3_media_store_path }}
 | |
| Restart=always
 | |
| RestartSec=5
 | |
| SyslogIdentifier=matrix-goofys
 | |
| 
 | |
| [Install]
 | |
| WantedBy=multi-user.target
 |