4 Commits

9 changed files with 40 additions and 17 deletions

View File

@ -1,6 +1,6 @@
namespace: finallycoffee namespace: finallycoffee
name: matrix name: matrix
version: 0.1.0 version: 0.1.1
readme: README.md readme: README.md
authors: authors:
- transcaffeine <transcaffeine@finally.coffee> - transcaffeine <transcaffeine@finally.coffee>

View File

@ -8,7 +8,7 @@ Module to generate and manage synapse signing keys.
## Requirements ## Requirements
- `python >= 3.9` - `python >= 3.9`
- `signed_json >= 1.1.4` - (pip) `signed_json >= 1.1.4`
## Usage examples ## Usage examples

View File

@ -2,6 +2,7 @@
# TURN / RTC configuration # TURN / RTC configuration
synapse_config_turn_uris: [] synapse_config_turn_uris: []
synapse_config_turn_shared_secret: ~ synapse_config_turn_shared_secret: ~
synapse_config_turn_shared_secret_path: ~
synapse_config_turn_username: ~ synapse_config_turn_username: ~
synapse_config_turn_password: ~ synapse_config_turn_password: ~
synapse_config_turn_user_lifetime: "2h" synapse_config_turn_user_lifetime: "2h"
@ -16,6 +17,8 @@ synapse_turn_config: >-2
synapse_turn_config_base synapse_turn_config_base
| combine(({ turn_shared_secret: synapse_config_turn_shared_secret }) | combine(({ turn_shared_secret: synapse_config_turn_shared_secret })
if synapse_config_turn_shared_secret | default(false, true) else {}) if synapse_config_turn_shared_secret | default(false, true) else {})
| combine(({ turn_shared_secret_path: synapse_config_turn_shared_secret_path })
if synapse_config_turn_shared_secret_path | default(false, true) else {})
| combine(({ turn_username: synapse_config_turn_username }) | combine(({ turn_username: synapse_config_turn_username })
if synapse_config_username | default(false, true) else {}) if synapse_config_username | default(false, true) else {})
| combine(({ turn_password: synapse_config_turn_password }) | combine(({ turn_password: synapse_config_turn_password })

View File

@ -1,7 +1,7 @@
--- ---
synapse_user: synapse synapse_user: synapse
synapse_group: synapse synapse_group: synapse
synapse_version: "1.115.0" synapse_version: "1.116.0"
synapse_state: "present" synapse_state: "present"
synapse_deployment_method: "docker" synapse_deployment_method: "docker"

View File

@ -1,12 +1,12 @@
--- ---
synapse_systemd_service_name: "synapse.service" synapse_systemd_name: "synapse.service"
synapse_systemd_service_directory: /etc/systemd/system synapse_systemd_service_directory: /etc/systemd/system
synapse_systemd_service_file: >-2 synapse_systemd_service_file: >-2
{{ synapse_systemd_service_directory }}/{{ synapse_systemd_service_name }} {{ synapse_systemd_service_directory }}/{{ synapse_systemd_name }}
synapse_systemd_service_state: >-2 synapse_systemd_state: >-2
{{ (synapse_state == 'present') | ternary('started', 'stopped') }} {{ (synapse_state == 'present') | ternary('started', 'stopped') }}
synapse_systemd_service_enabled: >-2 synapse_systemd_enabled: >-2
{{ (synapse_state == 'present') | bool }} {{ (synapse_state == 'present') | bool }}
synapse_systemd_unit_description: "Synapse matrix homeserver" synapse_systemd_unit_description: "Synapse matrix homeserver"

View File

@ -23,7 +23,7 @@
when: when:
- synapse_deployment_method == 'virtualenv' - synapse_deployment_method == 'virtualenv'
- ansible_facts['service_mgr'] == systemd - ansible_facts['service_mgr'] == systemd
- synapse_state == 'started' - synapse_systemd_state == 'started'
- name: Ensure systemd units are reloaded - name: Ensure systemd units are reloaded
listen: systemd-daemon-reload listen: systemd-daemon-reload

View File

@ -71,3 +71,4 @@
mode: "0640" mode: "0640"
notify: notify:
- synapse-restart - synapse-restart
when: synapse_state != 'absent'

View File

@ -27,6 +27,13 @@
virtualenv: "{{ synapse_venv_path }}" virtualenv: "{{ synapse_venv_path }}"
notify: notify:
- synapse-restart - synapse-restart
when: synapse_state != 'absent'
- name: Ensure synapse virtualenv is {{ synapse_state }}
ansible.builtin.file:
path: "{{ synapse_venv_path }}"
state: "{{ synapse_state }}"
when: synapse_state == 'absent'
- name: Ensure systemd unit is {{ synapse_state }} - name: Ensure systemd unit is {{ synapse_state }}
ansible.builtin.template: ansible.builtin.template:
@ -34,15 +41,27 @@
dest: "{{ synapse_systemd_service_file }}" dest: "{{ synapse_systemd_service_file }}"
notify: notify:
- systemd-daemon-reload - systemd-daemon-reload
when: synapse_state != 'absent'
- meta: flush_handlers - name: Ensure systemd unit is {{ synapse_state }}
ansible.builtin.file:
path: "{{ synapse_systemd_service_file }}"
state: "{{ synapse_state }}"
when: synapse_state == 'absent'
notify:
- systemd-daemon-reload
- name: Ensure systemd service is {{ synapse_state }} - name: Ensure handlers are flushed for systemd daemon reload and synapse service state propagation
meta: flush_handlers
- name: Ensure systemd service is {{ synapse_systemd_state }}
ansible.builtin.systemd_service: ansible.builtin.systemd_service:
name: "{{ synapse_systemd_service_name }}" name: "{{ synapse_systemd_name }}"
state: "{{ synapse_systemd_service_state }}" state: "{{ synapse_systemd_state }}"
when: synapse_state != 'absent'
- name: Ensure systemd service is {{ synapse_systemd_service_enabled | ternary('enabled', 'disabled') }} - name: Ensure systemd service is {{ synapse_systemd_enabled | ternary('enabled', 'disabled') }}
ansible.builtin.systemd_service: ansible.builtin.systemd_service:
name: "{{ synapse_systemd_service_name }}" name: "{{ synapse_systemd_name }}"
enabled: "{{ synapse_systemd_service_enabled }}" enabled: "{{ synapse_systemd_enabled }}"
when: synapse_state != 'absent'

View File

@ -1,5 +1,5 @@
[Unit] [Unit]
Description="{{ synapse_systemd_unit_description }}" Description={{ synapse_systemd_unit_description }}
{% if synapse_systemd_unit_after | default([]) | length > 0 %} {% if synapse_systemd_unit_after | default([]) | length > 0 %}
After={{ synapse_systemd_unit_after | join(' ') }} After={{ synapse_systemd_unit_after | join(' ') }}
@ -38,7 +38,7 @@ RestrictAddressFamilies={{ synapse_systemd_service_restrict_address_families | j
RemoveIPC={{ synapse_systemd_service_remove_ipc }} RemoveIPC={{ synapse_systemd_service_remove_ipc }}
LockPersonality={{ synapse_systemd_service_lock_personality }} LockPersonality={{ synapse_systemd_service_lock_personality }}
NoNewPersonalities={{ synapse_systemd_service_no_new_privileges }} NoNewPrivileges={{ synapse_systemd_service_no_new_privileges }}
[Install] [Install]
WantedBy={{ synapse_systemd_install_wanted_by }} WantedBy={{ synapse_systemd_install_wanted_by }}