Keeps up with a1f64f5159 (diff-0ccf69eb4d59a7645eb4d0a0b077e693948edb33ad06df043bba3fb30122879b)
pull/774/head
| @@ -92,7 +92,7 @@ matrix_ma1sd_dns_overwrite_homeserver_client_value: "http://matrix-synapse:8008" | |||||
| matrix_ma1sd_threepid_medium_email_custom_templates_enabled: false | matrix_ma1sd_threepid_medium_email_custom_templates_enabled: false | ||||
| matrix_ma1sd_threepid_medium_email_custom_invite_template: "" | matrix_ma1sd_threepid_medium_email_custom_invite_template: "" | ||||
| matrix_ma1sd_threepid_medium_email_custom_session_validation_template: "" | matrix_ma1sd_threepid_medium_email_custom_session_validation_template: "" | ||||
| matrix_ma1sd_threepid_medium_email_custom_unbind_fraudulent_template: "" | |||||
| matrix_ma1sd_threepid_medium_email_custom_session_unbind_notification_template: "" | |||||
| matrix_ma1sd_threepid_medium_email_custom_matrixid_template: "" | matrix_ma1sd_threepid_medium_email_custom_matrixid_template: "" | ||||
| # Controls whether the self-check feature should validate SSL certificates. | # Controls whether the self-check feature should validate SSL certificates. | ||||
| @@ -117,7 +117,7 @@ | |||||
| with_items: | with_items: | ||||
| - {value: "{{ matrix_ma1sd_threepid_medium_email_custom_invite_template }}", location: 'invite-template.eml'} | - {value: "{{ matrix_ma1sd_threepid_medium_email_custom_invite_template }}", location: 'invite-template.eml'} | ||||
| - {value: "{{ matrix_ma1sd_threepid_medium_email_custom_session_validation_template }}", location: 'validate-template.eml'} | - {value: "{{ matrix_ma1sd_threepid_medium_email_custom_session_validation_template }}", location: 'validate-template.eml'} | ||||
| - {value: "{{ matrix_ma1sd_threepid_medium_email_custom_unbind_fraudulent_template }}", location: 'unbind-fraudulent.eml'} | |||||
| - {value: "{{ matrix_ma1sd_threepid_medium_email_custom_session_unbind_notification_template }}", location: 'unbind-notification.eml'} | |||||
| - {value: "{{ matrix_ma1sd_threepid_medium_email_custom_matrixid_template }}", location: 'mxid-template.eml'} | - {value: "{{ matrix_ma1sd_threepid_medium_email_custom_matrixid_template }}", location: 'mxid-template.eml'} | ||||
| when: "matrix_ma1sd_threepid_medium_email_custom_templates_enabled|bool and item.value" | when: "matrix_ma1sd_threepid_medium_email_custom_templates_enabled|bool and item.value" | ||||
| @@ -54,6 +54,7 @@ | |||||
| when: "vars | dict2items | selectattr('key', 'match', item.old) | list | items2dict" | when: "vars | dict2items | selectattr('key', 'match', item.old) | list | items2dict" | ||||
| with_items: | with_items: | ||||
| - {'old': 'matrix_ma1sd_container_expose_port', 'new': '<superseded by matrix_ma1sd_container_http_host_bind_port>'} | - {'old': 'matrix_ma1sd_container_expose_port', 'new': '<superseded by matrix_ma1sd_container_http_host_bind_port>'} | ||||
| - {'old': 'matrix_ma1sd_threepid_medium_email_custom_unbind_fraudulent_template', 'new': 'matrix_ma1sd_threepid_medium_email_custom_session_unbind_notification_template'} | |||||
| - name: (Deprecation) Catch and report mxisd variables | - name: (Deprecation) Catch and report mxisd variables | ||||
| fail: | fail: | ||||
| @@ -57,14 +57,14 @@ threepid: | |||||
| {% if matrix_ma1sd_threepid_medium_email_custom_invite_template %} | {% if matrix_ma1sd_threepid_medium_email_custom_invite_template %} | ||||
| invite: '/var/ma1sd/invite-template.eml' | invite: '/var/ma1sd/invite-template.eml' | ||||
| {% endif %} | {% endif %} | ||||
| {% if matrix_ma1sd_threepid_medium_email_custom_session_validation_template or matrix_ma1sd_threepid_medium_email_custom_unbind_fraudulent_template %} | |||||
| {% if matrix_ma1sd_threepid_medium_email_custom_session_validation_template or matrix_ma1sd_threepid_medium_email_custom_session_unbind_notification_template %} | |||||
| session: | session: | ||||
| {% if matrix_ma1sd_threepid_medium_email_custom_session_validation_template %} | {% if matrix_ma1sd_threepid_medium_email_custom_session_validation_template %} | ||||
| validation: '/var/ma1sd/validate-template.eml' | validation: '/var/ma1sd/validate-template.eml' | ||||
| {% endif %} | {% endif %} | ||||
| {% if matrix_ma1sd_threepid_medium_email_custom_unbind_fraudulent_template %} | |||||
| {% if matrix_ma1sd_threepid_medium_email_custom_session_unbind_notification_template %} | |||||
| unbind: | unbind: | ||||
| frandulent: '/var/ma1sd/unbind-fraudulent.eml' | |||||
| notification: '/var/ma1sd/unbind-notification.eml' | |||||
| {% endif %} | {% endif %} | ||||
| {% endif %} | {% endif %} | ||||
| {% if matrix_ma1sd_threepid_medium_email_custom_matrixid_template %} | {% if matrix_ma1sd_threepid_medium_email_custom_matrixid_template %} | ||||