[refator] inject arguments into elementweb

This commit is contained in:
Nico Schottelius 2024-02-22 18:51:24 +09:00
parent 9ece29547b
commit 78f67b9a83
4 changed files with 32 additions and 6 deletions

View file

@ -21,6 +21,11 @@ runa:
uid: 991 uid: 991
- name: turn - name: turn
uid: 65534 uid: 65534
matrix:
homeserver: ""
elementweb: ""
matrixdomain: ""
logout_redirect_url: ""
children: children:
ank: ank:
hosts: hosts:
@ -35,6 +40,12 @@ runa:
realm: "turn-2.corp-serv.net" realm: "turn-2.corp-serv.net"
external_ip: "135.125.151.177/10.80.24.42" external_ip: "135.125.151.177/10.80.24.42"
lat: lat:
vars:
matrix:
homeserver: "synapse.corp-apps.com"
elementweb: "element.corp-serv.net"
matrixdomain: "corp-serv.net"
logout_redirect_url: "https://idp.corp-serv.net/realms/MAT/protocol/openid-connect/logout"
hosts: hosts:
mtx-elem-1.lat.internal.ru.com: mtx-elem-1.lat.internal.ru.com:
matrix_service: "elementweb" matrix_service: "elementweb"
@ -57,6 +68,12 @@ runa:
mtx-mngm-2.lat.internal.ru.com: mtx-mngm-2.lat.internal.ru.com:
matrix_service: "synapse-admin" matrix_service: "synapse-admin"
lta: lta:
vars:
matrix:
homeserver: "synapse.lta.corp-apps.com"
elementweb: "element.lta.corp-serv.net"
matrixdomain: "lta.corp-serv.net"
logout_redirect_url: "FIXME"
hosts: hosts:
mtx-mngm-1.lta.internal.ru.com: mtx-mngm-1.lta.internal.ru.com:
matrix_service: "synapse-admin" matrix_service: "synapse-admin"

View file

@ -26,3 +26,12 @@
mode: '0644' mode: '0644'
tags: tags:
- test - test
- name: Create elementweb config
ansible.builtin.template:
src: "elementweb/config.json"
dest: /home/{{ ansible_user }}/docker_compose/{{ matrix_service }}/config.json
owner: "{{ ansible_user }}"
mode: '0644'
tags:
- test

View file

@ -1,8 +1,8 @@
{ {
"default_server_config": { "default_server_config": {
"m.homeserver": { "m.homeserver": {
"base_url": "https://synapse.corp-apps.com", "base_url": "https://{{ matrix.homeserver }}",
"server_name": "corp-serv.net" "server_name": "{{ matrix.matrixdomain }}"
}, },
"m.identity_server": { "m.identity_server": {
"base_url": "https://vector.im" "base_url": "https://vector.im"
@ -45,7 +45,7 @@
"participant_limit": 8, "participant_limit": 8,
"brand": "Element Call" "brand": "Element Call"
}, },
"logout_redirect_url": "https://idp.corp-serv.net/realms/MAT/protocol/openid-connect/logout", "logout_redirect_url": "{{ matrix.logout_redirect_url }}",
"sso_redirect_options": { "sso_redirect_options": {
"immediate": true "immediate": true
}, },

View file

@ -26,7 +26,7 @@
# lowercase and may contain an explicit port. # lowercase and may contain an explicit port.
# Examples: matrix.org, localhost:8080 # Examples: matrix.org, localhost:8080
# #
server_name: "corp-serv.net" server_name: "{{ matrix.matrixdomain }}"
# When running as a daemon, the file to store the pid in # When running as a daemon, the file to store the pid in
# #
@ -40,7 +40,7 @@ pid_file: /homeserver.pid
# under the 'listeners' configuration, however this is a security risk: # under the 'listeners' configuration, however this is a security risk:
# https://github.com/matrix-org/synapse#security-note # https://github.com/matrix-org/synapse#security-note
# #
web_client_location: https://element.corp-serv.net web_client_location: https://{{ matrix.elementweb }}
# The public-facing base URL that clients use to access this Homeserver (not # The public-facing base URL that clients use to access this Homeserver (not
# including _matrix/...). This is the same URL a user might enter into the # including _matrix/...). This is the same URL a user might enter into the
@ -49,7 +49,7 @@ web_client_location: https://element.corp-serv.net
# Otherwise, it should be the URL to reach Synapse's client HTTP listener (see # Otherwise, it should be the URL to reach Synapse's client HTTP listener (see
# 'listeners' below). # 'listeners' below).
# #
public_baseurl: https://synapse.corp-apps.com public_baseurl: https://{{ matrix.homeserver }}
# Set the soft limit on the number of file descriptors synapse can use # Set the soft limit on the number of file descriptors synapse can use
# Zero is used to indicate synapse should set the soft limit to the # Zero is used to indicate synapse should set the soft limit to the