From f9e3bcf3c872cc954010c81fef1d45169205b995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 24 Mar 2019 17:06:43 +0100 Subject: [PATCH 1/2] document changes to tls handling --- README.md | 4 ++-- defaults/main.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 794f9ad..0335ec0 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ The following should be present on the target system | Name | Type | Description | | :--- | :--- | :--- | | **matrix_server_name** | __string__ | | -| **matrix_synapse_tls_cert** | __string__ | server's TLS certificate chain (_when matrix_synapse_skip_tls not set_)| -| **matrix_synapse_tls_key** | __string__ | server's TLS key (_when matrix_synapse_skip_tls not set_)| +| **matrix_synapse_tls_cert** | __string__ | server's TLS certificate chain (_when matrix_synapse_extra_config.no_tls is set to true_)| +| **matrix_synapse_tls_key** | __string__ | server's TLS key (_when matrix_synapse_extra_config.no_tls is set to true_)| | **matrix_synapse_report_stats** | __bool__ | Report the stats to matrix.org | | **matrix_synapse_pg_host** | __sting__ | postgresql server | | **matrix_synapse_pg_user** | __string__ | postgresql user | diff --git a/defaults/main.yml b/defaults/main.yml index b9269c5..f20ad54 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,7 +9,6 @@ matrix_synapse_baseurl: "https://{{ matrix_server_name }}" matrix_synapse_signing_key_path: "{{ matrix_synapse_base_path }}/tls/{{ matrix_server_name }}.signing.key" matrix_synapse_version: "v0.99.2" matrix_synapse_log_days_keep: 30 -matrix_synapse_skip_tls: false matrix_synapse_pid_file: "{{ matrix_synapse_base_path }}/synapse.pid" matrix_synapse_docker_ports: ["8008:8008", "8448:8448"] matrix_synapse_docker_labels: {} From 78452b98ebfbd509dde970f4dab62538eb0ddbf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 24 Mar 2019 17:07:00 +0100 Subject: [PATCH 2/2] update default version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0335ec0..f30239c 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ The following should be present on the target system | matrix_synapse_dh_path | "{{ matrix_synapse_base_path }}/tls/{{ matrix_server_name }}.dh" | | matrix_synapse_baseurl | "https://{{ matrix_server_name }}" | | matrix_synapse_signing_key_path | "{{ matrix_synapse_base_path }}/ssl/{{ matrix_server_name }}.signing.key" | -| matrix_synapse_version | "v0.99.1.1" | +| matrix_synapse_version | "v0.99.2" | | matrix_synapse_log_days_keep | 30 | | matrix_synapse_deployment_method | pip | Either pip or docker [¹](#footnote_1) | | matrix_synapse_supervision_method | systemd | Either systemd, runit or docker [¹](#footnote_1) |