ansible
/
xoxys.matrix
1
0
Fork 0
Code Issues Pull Requests Releases Activity

add missing urlsplit for base url transformation

This commit is contained in:
Robert Kaussow 2019-01-19 15:16:38 +01:00
parent 9dc7746fb7
commit 16e8accd13
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/install.yml
View File

@ -34,9 +34,9 @@
virtualenv_command: /usr/bin/python3 -m venv
- name: Create signing key
shell: "{{ matrix_base_dir }}/env/bin/python -c \"from signedjson import key; file = open('{{ matrix_conf_dir }}/{{ matrix_base_url }}.signing.key','w'); key.write_signing_keys(file, [key.generate_signing_key('first')]); file.close()\""
shell: "{{ matrix_base_dir }}/env/bin/python -c \"from signedjson import key; file = open('{{ matrix_conf_dir }}/{{ matrix_base_url | urlsplit('hostname') }}.signing.key','w'); key.write_signing_keys(file, [key.generate_signing_key('first')]); file.close()\""
args:
creates: "{{ matrix_conf_dir }}/{{ matrix_base_url }}.signing.key"
creates: "{{ matrix_conf_dir }}/{{ matrix_base_url | urlsplit('hostname') }}.signing.key"
notify: __matrix_restart
- name: Deploy global config files

2
templates/opt/matrix/config/homeserver.yml.j2
View File

@ -545,7 +545,7 @@ form_secret: "5l51Jk51RyULKH4RbeYdnI5P^ROOOktfj-nWgK0i8JT_sd-CC."
## Signing Keys ##
# Path to the signing key to sign messages with
signing_key_path: "{{ matrix_conf_dir }}/{{ matrix_base_url }}.signing.key"
signing_key_path: "{{ matrix_conf_dir }}/{{ matrix_base_url | urlsplit('hostname') }}.signing.key"
# The keys that the server used to sign messages with but won't use
# to sign new messages. E.g. it has lost its private key