pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixes from a first trial run

Browse source
This commit is contained in:
Charles Wright 2022-08-04 13:16:32 -05:00
parent f4afbe8ede
commit 2d7c427504
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/matrix-conduit/defaults/main.yml
View file

@ -11,10 +11,12 @@ matrix_conduit_docker_image_force_pull: "{{ matrix_conduit_docker_image.endswith
matrix_conduit_base_path: "{{ matrix_base_data_path }}/conduit" matrix_conduit_base_path: "{{ matrix_base_data_path }}/conduit"
matrix_conduit_config_dir_path: "{{ matrix_conduit_base_path }}/config" matrix_conduit_config_dir_path: "{{ matrix_conduit_base_path }}/config"
matrix_conduit_storage_path: "{{ matrix_conduit_base_path }}/storage" matrix_conduit_data_dir_path: "{{ matrix_conduit_base_path }}/storage"
matrix_conduit_port_number: 6167 matrix_conduit_port_number: 6167
matrix_conduit_tmp_directory_size_mb: 500
# List of systemd services that matrix-conduit.service depends on # List of systemd services that matrix-conduit.service depends on
matrix_conduit_systemd_required_services_list: ["docker.service"] matrix_conduit_systemd_required_services_list: ["docker.service"]

6
roles/matrix-conduit/templates/conduit/conduit.toml.j2
View file

@ -35,12 +35,12 @@ port = {{ matrix_conduit_port_number }}
max_request_size = {{ matrix_conduit_max_request_size }} max_request_size = {{ matrix_conduit_max_request_size }}
# Enables registration. If set to false, no users can register on this server. # Enables registration. If set to false, no users can register on this server.
allow_registration = {{ matrix_conduit_allow_registration }} allow_registration = {{ matrix_conduit_allow_registration | to_json | replace("\"", "") }}
allow_federation = {{ matrix_conduit_allow_federation }} allow_federation = {{ matrix_conduit_allow_federation | to_json | replace("\"", "") }}
# Enable the display name lightning bolt on registration. # Enable the display name lightning bolt on registration.
enable_lightning_bolt = {{ matrix_conduit_enable_lightning_bolt }} enable_lightning_bolt = {{ matrix_conduit_enable_lightning_bolt | to_json | replace("\"", "") }}
trusted_servers = {{ matrix_conduit_trusted_servers }} trusted_servers = {{ matrix_conduit_trusted_servers }}

3
roles/matrix-conduit/templates/conduit/systemd/matrix-conduit.service.j2
View file

@ -19,8 +19,9 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-conduit \
--read-only \ --read-only \
--tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_conduit_tmp_directory_size_mb }}m \ --tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_conduit_tmp_directory_size_mb }}m \
--network={{ matrix_docker_network }} \ --network={{ matrix_docker_network }} \
--env CONDUIT_CONFIG=/etc/matrix-conduit/conduit.toml \
--mount type=bind,src={{ matrix_conduit_data_dir_path }},dst=/var/lib/matrix-conduit \
--mount type=bind,src={{ matrix_conduit_config_dir_path }},dst=/etc/matrix-conduit,ro \ --mount type=bind,src={{ matrix_conduit_config_dir_path }},dst=/etc/matrix-conduit,ro \
--mount type=bind,src={{ matrix_conduit_data_dir_path }},dst=/var/lib/conduit \
{% for arg in matrix_conduit_container_extra_arguments %} {% for arg in matrix_conduit_container_extra_arguments %}
{{ arg }} \ {{ arg }} \
{% endfor %} {% endfor %}