finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename some Dendrite variables to improve consistency

Browse Source
This commit is contained in:
Slavi Pantaleev 2023-03-14 08:52:15 +02:00
parent fd2f497ac0
commit 4c1db32ef9
4 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
group_vars/matrix_servers
View File

@ -2718,15 +2718,15 @@ devture_postgres_managed_databases_auto: |
}] if (matrix_synapse_enabled and matrix_synapse_database_host == devture_postgres_connection_hostname) else []) }] if (matrix_synapse_enabled and matrix_synapse_database_host == devture_postgres_connection_hostname) else [])
+ +
([{ ([{
'name': matrix_dendrite_federationapi_database, 'name': matrix_dendrite_federation_api_database,
'username': matrix_dendrite_database_user, 'username': matrix_dendrite_database_user,
'password': matrix_dendrite_database_password, 'password': matrix_dendrite_database_password,
},{ },{
'name': matrix_dendrite_keyserver_database, 'name': matrix_dendrite_key_server_database,
'username': matrix_dendrite_database_user, 'username': matrix_dendrite_database_user,
'password': matrix_dendrite_database_password, 'password': matrix_dendrite_database_password,
},{ },{
'name': matrix_dendrite_mediaapi_database, 'name': matrix_dendrite_media_api_database,
'username': matrix_dendrite_database_user, 'username': matrix_dendrite_database_user,
'password': matrix_dendrite_database_password, 'password': matrix_dendrite_database_password,
},{ },{
@ -2734,15 +2734,15 @@ devture_postgres_managed_databases_auto: |
'username': matrix_dendrite_database_user, 'username': matrix_dendrite_database_user,
'password': matrix_dendrite_database_password, 'password': matrix_dendrite_database_password,
},{ },{
'name': matrix_dendrite_syncapi_database, 'name': matrix_dendrite_sync_api_database,
'username': matrix_dendrite_database_user, 'username': matrix_dendrite_database_user,
'password': matrix_dendrite_database_password, 'password': matrix_dendrite_database_password,
},{ },{
'name': matrix_dendrite_userapi_database, 'name': matrix_dendrite_user_api_database,
'username': matrix_dendrite_database_user, 'username': matrix_dendrite_database_user,
'password': matrix_dendrite_database_password, 'password': matrix_dendrite_database_password,
},{ },{
'name': matrix_dendrite_pushserver_database, 'name': matrix_dendrite_push_server_database,
'username': matrix_dendrite_database_user, 'username': matrix_dendrite_database_user,
'password': matrix_dendrite_database_password, 'password': matrix_dendrite_database_password,
},{ },{

14
roles/custom/matrix-dendrite/defaults/main.yml
View File

@ -150,13 +150,13 @@ matrix_dendrite_database_str: "postgresql://{{ matrix_dendrite_database_user }}:
matrix_dendrite_database_hostname: '' matrix_dendrite_database_hostname: ''
matrix_dendrite_database_user: "dendrite" matrix_dendrite_database_user: "dendrite"
matrix_dendrite_database_password: "itsasecret" matrix_dendrite_database_password: "itsasecret"
matrix_dendrite_federationapi_database: "dendrite_federationapi" matrix_dendrite_federation_api_database: "dendrite_federationapi"
matrix_dendrite_keyserver_database: "dendrite_keyserver" matrix_dendrite_key_server_database: "dendrite_keyserver"
matrix_dendrite_mediaapi_database: "dendrite_mediaapi" matrix_dendrite_media_api_database: "dendrite_mediaapi"
matrix_dendrite_room_database: "dendrite_room" matrix_dendrite_room_database: "dendrite_room"
matrix_dendrite_syncapi_database: "dendrite_syncapi" matrix_dendrite_sync_api_database: "dendrite_syncapi"
matrix_dendrite_userapi_database: "dendrite_userapi" matrix_dendrite_user_api_database: "dendrite_userapi"
matrix_dendrite_pushserver_database: "dendrite_pushserver" matrix_dendrite_push_server_database: "dendrite_pushserver"
matrix_dendrite_mscs_database: "dendrite_mscs" matrix_dendrite_mscs_database: "dendrite_mscs"
matrix_dendrite_client_api_turn_uris: [] matrix_dendrite_client_api_turn_uris: []
@ -206,7 +206,7 @@ matrix_dendrite_configuration_extension: "{{ matrix_dendrite_configuration_exten
# You most likely don't need to touch this variable. Instead, see `matrix_dendrite_configuration_yaml`. # You most likely don't need to touch this variable. Instead, see `matrix_dendrite_configuration_yaml`.
matrix_dendrite_configuration: "{{ matrix_dendrite_configuration_yaml | from_yaml | combine(matrix_dendrite_configuration_extension, recursive=True) }}" matrix_dendrite_configuration: "{{ matrix_dendrite_configuration_yaml | from_yaml | combine(matrix_dendrite_configuration_extension, recursive=True) }}"
matrix_dendrite_userapi_auto_join_rooms: [] matrix_dendrite_user_api_auto_join_rooms: []
# statistics reporting configuration. These statistics contain the server # statistics reporting configuration. These statistics contain the server
# name, number of active users and some information on your deployment config. # name, number of active users and some information on your deployment config.

7
roles/custom/matrix-dendrite/tasks/validate_config.yml
View File

@ -27,3 +27,10 @@
- {'old': 'matrix_dendrite_rate_limiting_enabled', 'new': 'matrix_dendrite_client_api_rate_limiting_enabled'} - {'old': 'matrix_dendrite_rate_limiting_enabled', 'new': 'matrix_dendrite_client_api_rate_limiting_enabled'}
- {'old': 'matrix_dendrite_rate_limiting_threshold', 'new': 'matrix_dendrite_client_api_rate_limiting_threshold'} - {'old': 'matrix_dendrite_rate_limiting_threshold', 'new': 'matrix_dendrite_client_api_rate_limiting_threshold'}
- {'old': 'matrix_dendrite_rate_limiting_cooloff_ms', 'new': 'matrix_dendrite_client_api_rate_limiting_cooloff_ms'} - {'old': 'matrix_dendrite_rate_limiting_cooloff_ms', 'new': 'matrix_dendrite_client_api_rate_limiting_cooloff_ms'}
- {'old': 'matrix_dendrite_mediaapi_database', 'new': 'matrix_dendrite_media_api_database'}
- {'old': 'matrix_dendrite_syncapi_database', 'new': 'matrix_dendrite_sync_api_database'}
- {'old': 'matrix_dendrite_userapi_database', 'new': 'matrix_dendrite_user_api_database'}
- {'old': 'matrix_dendrite_userapi_auto_join_rooms', 'new': 'matrix_dendrite_user_api_auto_join_rooms'}
- {'old': 'matrix_dendrite_federationapi_database', 'new': 'matrix_dendrite_federation_api_database'}
- {'old': 'matrix_dendrite_pushserver_database', 'new': 'matrix_dendrite_push_server_database'}
- {'old': 'matrix_dendrite_keyserver_database', 'new': 'matrix_dendrite_key_server_database'}

14
roles/custom/matrix-dendrite/templates/dendrite/dendrite.yaml.j2
View File

@ -223,7 +223,7 @@ federation_api:
external_api: external_api:
listen: http://0.0.0.0:8072 listen: http://0.0.0.0:8072
database: database:
connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_federationapi_database }}?sslmode=disable connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_federation_api_database }}?sslmode=disable
max_open_conns: 10 max_open_conns: 10
max_idle_conns: 2 max_idle_conns: 2
conn_max_lifetime: -1 conn_max_lifetime: -1
@ -266,7 +266,7 @@ key_server:
listen: http://0.0.0.0:7779 listen: http://0.0.0.0:7779
connect: http://key_server:7779 connect: http://key_server:7779
database: database:
connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_keyserver_database }}?sslmode=disable connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_key_server_database }}?sslmode=disable
max_open_conns: 10 max_open_conns: 10
max_idle_conns: 2 max_idle_conns: 2
conn_max_lifetime: -1 conn_max_lifetime: -1
@ -279,7 +279,7 @@ media_api:
external_api: external_api:
listen: http://0.0.0.0:8074 listen: http://0.0.0.0:8074
database: database:
connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_mediaapi_database }}?sslmode=disable connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_media_api_database }}?sslmode=disable
max_open_conns: 10 max_open_conns: 10
max_idle_conns: 2 max_idle_conns: 2
conn_max_lifetime: -1 conn_max_lifetime: -1
@ -342,7 +342,7 @@ sync_api:
external_api: external_api:
listen: http://0.0.0.0:8073 listen: http://0.0.0.0:8073
database: database:
connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_syncapi_database }}?sslmode=disable connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_sync_api_database }}?sslmode=disable
max_open_conns: 10 max_open_conns: 10
max_idle_conns: 2 max_idle_conns: 2
conn_max_lifetime: -1 conn_max_lifetime: -1
@ -376,7 +376,7 @@ user_api:
listen: http://0.0.0.0:7781 listen: http://0.0.0.0:7781
connect: http://user_api:7781 connect: http://user_api:7781
account_database: account_database:
connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_userapi_database }}?sslmode=disable connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_user_api_database }}?sslmode=disable
max_open_conns: 10 max_open_conns: 10
max_idle_conns: 2 max_idle_conns: 2
conn_max_lifetime: -1 conn_max_lifetime: -1
@ -385,7 +385,7 @@ user_api:
# is considered to be valid in milliseconds. # is considered to be valid in milliseconds.
# The default lifetime is 3600000ms (60 minutes). # The default lifetime is 3600000ms (60 minutes).
# openid_token_lifetime_ms: 3600000 # openid_token_lifetime_ms: 3600000
auto_join_rooms: {{ matrix_dendrite_userapi_auto_join_rooms | to_json }} auto_join_rooms: {{ matrix_dendrite_user_api_auto_join_rooms | to_json }}
# Not in dendrite-config.yaml, but is in build/docker/config/dendrite.yaml # Not in dendrite-config.yaml, but is in build/docker/config/dendrite.yaml
# Configuration for the Push Server API. # Configuration for the Push Server API.
@ -394,7 +394,7 @@ push_server:
listen: http://localhost:7782 listen: http://localhost:7782
connect: http://localhost:7782 connect: http://localhost:7782
database: database:
connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_pushserver_database }}?sslmode=disable connection_string: {{ matrix_dendrite_database_str }}/{{ matrix_dendrite_push_server_database }}?sslmode=disable
max_open_conns: 10 max_open_conns: 10
max_idle_conns: 2 max_idle_conns: 2
conn_max_lifetime: -1 conn_max_lifetime: -1