jowj/matrix-docker-ansible-deploy
1
0
Fork 0
forked from mirrors/matrix-docker-ansible-deploy
Code Issues Pull Requests Releases Wiki Activity

Fix typos in some variables (matrix_mxid -> matrix_mxisd)

Browse Source
This commit is contained in:
Slavi Pantaleev 2019-01-17 14:47:37 +02:00
parent d0b7ab2f05
commit df0d465482
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
group_vars/matrix-servers
View File

@ -119,10 +119,10 @@ matrix_mxisd_synapsesql_type: postgresql
matrix_mxisd_synapsesql_connection: //{{ matrix_synapse_database_host }}/{{ matrix_synapse_database_database }}?user={{ matrix_synapse_database_user }}&password={{ matrix_synapse_database_password }}
# By default, we send mail through the `matrix-mailer` service.
matrix_mxid_threepid_medium_email_identity_from: "{{ matrix_mailer_sender_address }}"
matrix_mxid_threepid_medium_email_connectors_smtp_host: "matrix-mailer"
matrix_mxid_threepid_medium_email_connectors_smtp_port: 587
matrix_mxid_threepid_medium_email_connectors_smtp_tls: 0
matrix_mxisd_threepid_medium_email_identity_from: "{{ matrix_mailer_sender_address }}"
matrix_mxisd_threepid_medium_email_connectors_smtp_host: "matrix-mailer"
matrix_mxisd_threepid_medium_email_connectors_smtp_port: 587
matrix_mxisd_threepid_medium_email_connectors_smtp_tls: 0
matrix_mxisd_systemd_wanted_services_list: |
{{
@ -296,4 +296,4 @@ matrix_synapse_systemd_wanted_services_list: |
#
# /matrix-synapse
#
######################################################################
######################################################################

26
roles/matrix-mxisd/defaults/main.yml
View File

@ -29,12 +29,12 @@ matrix_mxisd_synapsesql_type: ""
matrix_mxisd_synapsesql_connection: ""
# Setting up email-sending settings is required for using mxisd.
matrix_mxid_threepid_medium_email_identity_from: "matrix@{{ hostname_identity }}"
matrix_mxid_threepid_medium_email_connectors_smtp_host: ""
matrix_mxid_threepid_medium_email_connectors_smtp_port: 587
matrix_mxid_threepid_medium_email_connectors_smtp_tls: 1
matrix_mxid_threepid_medium_email_connectors_smtp_login: ""
matrix_mxid_threepid_medium_email_connectors_smtp_password: ""
matrix_mxisd_threepid_medium_email_identity_from: "matrix@{{ hostname_identity }}"
matrix_mxisd_threepid_medium_email_connectors_smtp_host: ""
matrix_mxisd_threepid_medium_email_connectors_smtp_port: 587
matrix_mxisd_threepid_medium_email_connectors_smtp_tls: 1
matrix_mxisd_threepid_medium_email_connectors_smtp_login: ""
matrix_mxisd_threepid_medium_email_connectors_smtp_password: ""
# Default mxisd configuration template which covers the generic use case.
# You can customize it by controlling the various variables inside it.
@ -65,14 +65,14 @@ matrix_mxisd_configuration_yaml: |
medium:
email:
identity:
from: {{ matrix_mxid_threepid_medium_email_identity_from }}
from: {{ matrix_mxisd_threepid_medium_email_identity_from }}
connectors:
smtp:
host: {{ matrix_mxid_threepid_medium_email_connectors_smtp_host }}
port: {{ matrix_mxid_threepid_medium_email_connectors_smtp_port }}
tls: {{ matrix_mxid_threepid_medium_email_connectors_smtp_tls }}
login: {{ matrix_mxid_threepid_medium_email_connectors_smtp_login }}
password: {{ matrix_mxid_threepid_medium_email_connectors_smtp_password }}
host: {{ matrix_mxisd_threepid_medium_email_connectors_smtp_host }}
port: {{ matrix_mxisd_threepid_medium_email_connectors_smtp_port }}
tls: {{ matrix_mxisd_threepid_medium_email_connectors_smtp_tls }}
login: {{ matrix_mxisd_threepid_medium_email_connectors_smtp_login }}
password: {{ matrix_mxisd_threepid_medium_email_connectors_smtp_password }}
synapseSql:
enabled: {{ matrix_mxisd_synapsesql_enabled }}
@ -102,4 +102,4 @@ matrix_mxisd_configuration_extension_yaml: |
# Holds the final mxisd configuration (a combination of the default and its extension).
# You most likely don't need to touch this variable. Instead, see `matrix_mxisd_configuration_yaml`.
matrix_mxisd_configuration: "{{ matrix_mxisd_configuration_yaml|from_yaml|combine(matrix_mxisd_configuration_extension, recursive=True) }}"
matrix_mxisd_configuration: "{{ matrix_mxisd_configuration_yaml|from_yaml|combine(matrix_mxisd_configuration_extension, recursive=True) }}"

2
roles/matrix-mxisd/tasks/validate_config.yml
View File

@ -44,4 +44,4 @@
You need to define a required configuration setting (`{{ item }}`) for using mxisd.
when: "vars[item] == ''"
with_items:
- "matrix_mxid_threepid_medium_email_connectors_smtp_host"
- "matrix_mxisd_threepid_medium_email_connectors_smtp_host"