diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2024-03-18 19:31:31 +0100 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2024-03-18 19:31:31 +0100 |
| commit | 435724f3536cd1894d0b2a5832069c2690fb520d (patch) | |
| tree | 45ff230f7ff9f2e08c291ce53ca68cb68c08e477 | |
| parent | 1326313d20fc2dbf995e88f9f3ade473946e9534 (diff) | |
| download | playbooks-ansible-435724f3536cd1894d0b2a5832069c2690fb520d.tar.gz playbooks-ansible-435724f3536cd1894d0b2a5832069c2690fb520d.tar.xz playbooks-ansible-435724f3536cd1894d0b2a5832069c2690fb520d.zip | |
Minor fixes in mserver role
| -rw-r--r-- | roles/mserver/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/mserver/tasks/crt.yml | 4 | ||||
| -rw-r--r-- | roles/mserver/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/mserver/templates/saulnier.im.signing.key.j2 | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/roles/mserver/defaults/main.yml b/roles/mserver/defaults/main.yml index 2788f62..c786851 100644 --- a/roles/mserver/defaults/main.yml +++ b/roles/mserver/defaults/main.yml @@ -1,5 +1,6 @@ crtversion: "49" maindomain: "saulnier.im" +secondarydomain: "casperlefantom.net" turn_uris: - "turn:[2a01:e0a:473:35e0:0:fed0:a:7]:3478;transport=UDP" - "turn:[2001:bc8:3fec:d00:1eaf::]:3478;transport=UDP" diff --git a/roles/mserver/tasks/crt.yml b/roles/mserver/tasks/crt.yml index 5913cec..a1577d5 100644 --- a/roles/mserver/tasks/crt.yml +++ b/roles/mserver/tasks/crt.yml @@ -1,6 +1,6 @@ - name: Installation des fichiers certificat pour matrix client copy: - src: "certs/{{ maindomain }}.{{ ansible_hostname }}.matrix.{{ crtversion }}.crt" + src: "certs/{{ secondarydomain }}.{{ ansible_hostname }}.matrix.{{ crtversion }}.crt" dest: /etc/pki/tls/certs/{{ maindomain }}.matrix.crt owner: root group: root @@ -18,7 +18,7 @@ - name: Installation des fichiers clé pour matrix client copy: - src: "certs/{{ maindomain }}.{{ ansible_hostname }}.matrix.{{ crtversion }}.key" + src: "certs/{{ secondarydomain }}.{{ ansible_hostname }}.matrix.{{ crtversion }}.key" dest: /etc/pki/tls/private/{{ maindomain }}.matrix.key owner: root group: root diff --git a/roles/mserver/tasks/main.yml b/roles/mserver/tasks/main.yml index 493510f..fdc15a0 100644 --- a/roles/mserver/tasks/main.yml +++ b/roles/mserver/tasks/main.yml @@ -1,5 +1,6 @@ - name: Loading hidden variables include_vars: credentials.yml + tags: keys - name: Loading hidden variables include_vars: mailsystem.yml diff --git a/roles/mserver/templates/saulnier.im.signing.key.j2 b/roles/mserver/templates/saulnier.im.signing.key.j2 index da63a51..a4bb091 100644 --- a/roles/mserver/templates/saulnier.im.signing.key.j2 +++ b/roles/mserver/templates/saulnier.im.signing.key.j2 @@ -1,4 +1 @@ -# -# {{ ansible_managed }} -# ed25519 {{ signing_key }} |