From 70dc2aa32c5163c535db77b5826d5b22d842b896 Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Sun, 13 Jan 2019 17:41:19 +0000
Subject: [PATCH] Add missing vars to roles where they are used

---
 roles/matrix-nginx-proxy/defaults/main.yml | 4 +++-
 roles/matrix-synapse/defaults/main.yml     | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/roles/matrix-nginx-proxy/defaults/main.yml b/roles/matrix-nginx-proxy/defaults/main.yml
index 0562ca56..5d4eb807 100644
--- a/roles/matrix-nginx-proxy/defaults/main.yml
+++ b/roles/matrix-nginx-proxy/defaults/main.yml
@@ -3,6 +3,8 @@
 # But in case that's not the case, you may wish to prevent that
 # and take care of proxying by yourself.
 matrix_nginx_proxy_enabled: true
+matrix_riot_web_enabled: true
+matrix_corporal_enabled: false
 
 matrix_nginx_proxy_docker_image: "nginx:1.15.8-alpine"
 
@@ -47,4 +49,4 @@ matrix_ssl_lets_encrypt_support_email: "{{ host_specific_matrix_ssl_lets_encrypt
 
 matrix_ssl_base_path: "{{ matrix_base_data_path }}/ssl"
 matrix_ssl_config_dir_path: "{{ matrix_ssl_base_path }}/config"
-matrix_ssl_log_dir_path: "{{ matrix_ssl_base_path }}/log"
\ No newline at end of file
+matrix_ssl_log_dir_path: "{{ matrix_ssl_base_path }}/log"
diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index 6ebb3fa9..7395974d 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -11,6 +11,7 @@ matrix_synapse_ext_path: "{{ matrix_synapse_base_path }}/ext"
 # Normally, matrix-nginx-proxy is enabled and nginx can reach Synapse over the container network.
 # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
 # the Client/Server API's port to the local host (`127.0.0.1:8008`).
+matrix_nginx_proxy_enabled: true
 matrix_synapse_container_expose_client_server_api_port: "{{ not matrix_nginx_proxy_enabled }}"
 
 matrix_synapse_in_container_python_packages_path: "/usr/local/lib/python3.6/site-packages"
@@ -173,4 +174,4 @@ matrix_mautrix_whatsapp_enabled: false
 
 matrix_mautrix_whatsapp_docker_image: "tulir/mautrix-whatsapp:latest"
 
-matrix_mautrix_whatsapp_base_path: "{{ matrix_base_data_path }}/mautrix-whatsapp"
\ No newline at end of file
+matrix_mautrix_whatsapp_base_path: "{{ matrix_base_data_path }}/mautrix-whatsapp"