Implemented suggestions from Slavi

This commit is contained in:
Charles Wright 2022-08-05 09:59:35 -05:00
parent dffa91ec8e
commit 47caba38fb
4 changed files with 23 additions and 25 deletions

View File

@ -1,5 +1,23 @@
---
- name: Ensure Conduit config path exists
file:
path: "{{ matrix_conduit_config_path }}"
state: directory
mode: 0750
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
when: "matrix_conduit_enabled|bool"
- name: Ensure Conduit data path exists
file:
path: "{{ matrix_conduit_data_path }}"
state: directory
mode: 0770
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
when: "matrix_conduit_enabled|bool"
- import_tasks: "{{ role_path }}/tasks/conduit/setup_install.yml"
when: matrix_conduit_enabled|bool

View File

@ -4,7 +4,7 @@
tags:
- always
- import_tasks: "{{ role_path }}/tasks/setup_conduit.yml"
- import_tasks: "{{ role_path }}/tasks/conduit/setup.yml"
when: run_setup|bool
tags:
- setup-all

View File

@ -1,20 +0,0 @@
---
- name: Ensure Conduit config path exists
file:
path: "{{ matrix_conduit_config_path }}"
state: directory
mode: 0750
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
when: "matrix_conduit_enabled|bool"
- name: Ensure Conduit data path exists
file:
path: "{{ matrix_conduit_data_path }}"
state: directory
mode: 0770
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
when: "matrix_conduit_enabled|bool"
- import_tasks: "{{ role_path }}/tasks/conduit/setup.yml"

View File

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