Fixes to enable Conduit in setup-all

roles/matrix-base/defaults/main.yml

@@ -9,7 +9,7 @@
 matrix_domain: ~
 
 # This will contain the homeserver implementation that is in use.
-# Valid values: synapse, dendrite
+# Valid values: synapse, dendrite, conduit
 #
 # By default, we use Synapse, because it's the only full-featured Matrix server at the moment.
 #

roles/matrix-base/tasks/sanity_check.yml

@@ -3,7 +3,7 @@
 - name: Fail if invalid homeserver implementation
   fail:
     msg: "You need to set a valid homeserver implementation in `matrix_homeserver_implementation`"
-  when: "matrix_homeserver_implementation not in ['synapse', 'dendrite']"
+  when: "matrix_homeserver_implementation not in ['synapse', 'dendrite', 'conduit']"
 
 # We generally support Ansible 2.7.1 and above.
 - name: Fail if running on Ansible < 2.7.1

roles/matrix-conduit/defaults/main.yml

@@ -34,7 +34,7 @@ matrix_conduit_container_extra_arguments: []
 matrix_conduit_template_conduit_config: "{{ role_path }}/templates/conduit/conduit.toml.j2"
 
 # Max size for uploads, in bytes
-matrix_conduit_max_request_size: "20_000_000"
+matrix_conduit_max_request_size: 20_000_000
 
 # Enables registration. If set to false, no users can register on this server.
 matrix_conduit_allow_registration: true

roles/matrix-nginx-proxy/defaults/main.yml

@@ -147,6 +147,21 @@ matrix_nginx_proxy_proxy_dendrite_client_api_addr_sans_container: ""
 # A list of strings containing additional configuration blocks to add to the Dendrite's server configuration (matrix-dendrite.conf).
 matrix_nginx_proxy_proxy_dendrite_additional_server_configuration_blocks: []
 
+# Controls whether proxying for Conduit should be done.
+matrix_nginx_proxy_proxy_conduit_enabled: false
+matrix_nginx_proxy_proxy_conduit_hostname: "matrix-nginx-proxy"
+matrix_nginx_proxy_proxy_conduit_federation_api_enabled: "{{ matrix_nginx_proxy_proxy_matrix_federation_api_enabled }}"
+# Controls whether the Client API server (usually at matrix.DOMAIN:443) should explicitly reject `/_matrix/federation` endpoints.
+matrix_nginx_proxy_proxy_conduit_block_federation_api_on_client_port: true
+# The addresses where the Matrix Client API is, when using Conduit.
+matrix_nginx_proxy_proxy_conduit_client_api_addr_with_container: ""
+matrix_nginx_proxy_proxy_conduit_client_api_addr_sans_container: ""
+# The addresses where the Federation API is, when using Conduit.
+matrix_nginx_proxy_proxy_conduit_federation_api_addr_with_container: ""
+matrix_nginx_proxy_proxy_conduit_federation_api_addr_sans_container: ""
+# A list of strings containing additional configuration blocks to add to the Conduit's server configuration (matrix-conduit.conf).
+matrix_nginx_proxy_proxy_conduit_additional_server_configuration_blocks: []
+
 # Controls whether proxying the Element domain should be done.
 matrix_nginx_proxy_proxy_element_enabled: false
 matrix_nginx_proxy_proxy_element_hostname: "{{ matrix_server_fqn_element }}"

roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml

@@ -80,6 +80,19 @@
     state: absent
   when: "not matrix_nginx_proxy_proxy_dendrite_enabled|bool"
 
+- name: Ensure Matrix nginx-proxy configuration for matrix-conduit exists
+  template:
+    src: "{{ role_path }}/templates/nginx/conf.d/matrix-conduit.conf.j2"
+    dest: "{{ matrix_nginx_proxy_confd_path }}/matrix-conduit.conf"
+    mode: 0644
+  when: matrix_nginx_proxy_proxy_conduit_enabled|bool
+
+- name: Ensure Matrix nginx-proxy configuration for matrix-conduit deleted
+  file:
+    path: "{{ matrix_nginx_proxy_confd_path }}/matrix-conduit.conf"
+    state: absent
+  when: "not matrix_nginx_proxy_proxy_conduit_enabled|bool"
+
 - name: Ensure Matrix nginx-proxy configuration for Element domain exists
   template:
     src: "{{ role_path }}/templates/nginx/conf.d/matrix-client-element.conf.j2"

roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-conduit.conf.j2

@@ -0,0 +1,77 @@
+#jinja2: lstrip_blocks: "True"
+
+server {
+	listen 12080;
+	server_name {{ matrix_nginx_proxy_proxy_conduit_hostname }};
+
+	server_tokens off;
+	root /dev/null;
+
+	gzip on;
+	gzip_types text/plain application/json;
+
+	{% for configuration_block in matrix_nginx_proxy_proxy_conduit_additional_server_configuration_blocks %}
+		{{- configuration_block }}
+	{% endfor %}
+
+	{% if matrix_nginx_proxy_proxy_conduit_block_federation_api_on_client_port %}
+	location /_matrix/federation {
+		{% if matrix_nginx_proxy_proxy_conduit_federation_api_enabled %}
+			return 404 'The Federation API is served at https://{{ matrix_server_fqn_matrix }}:{{ matrix_federation_public_port }}';
+		{% else %}
+			return 404 'This Matrix server is running with federation disabled';
+		{% endif %}
+	}
+	{% endif %}
+
+	{# Everything else just goes to the API server ##}
+	location / {
+		{% if matrix_nginx_proxy_enabled %}
+			{# Use the embedded DNS resolver in Docker containers to discover the service #}
+			resolver 127.0.0.11 valid=5s;
+			set $backend "{{ matrix_nginx_proxy_proxy_conduit_client_api_addr_with_container }}";
+			proxy_pass http://$backend;
+		{% else %}
+			{# Generic configuration for use outside of our container setup #}
+			proxy_pass http://{{ matrix_nginx_proxy_proxy_conduit_client_api_addr_sans_container }};
+		{% endif %}
+
+		proxy_set_header Host $host;
+
+		client_body_buffer_size 25M;
+		client_max_body_size {{ matrix_nginx_proxy_proxy_matrix_client_api_client_max_body_size_mb }}M;
+		proxy_max_temp_file_size 0;
+	}
+}
+
+{% if matrix_nginx_proxy_proxy_conduit_federation_api_enabled %}
+server {
+	listen 12088;
+
+	server_name {{ matrix_nginx_proxy_proxy_conduit_hostname }};
+	server_tokens off;
+
+	root /dev/null;
+
+	gzip on;
+	gzip_types text/plain application/json;
+
+	location / {
+		{% if matrix_nginx_proxy_enabled %}
+			{# Use the embedded DNS resolver in Docker containers to discover the service #}
+			resolver 127.0.0.11 valid=5s;
+			set $backend "{{ matrix_nginx_proxy_proxy_conduit_federation_api_addr_with_container }}";
+			proxy_pass http://$backend;
+		{% else %}
+			{# Generic configuration for use outside of our container setup #}
+			proxy_pass http://{{ matrix_nginx_proxy_proxy_conduit_federation_api_addr_sans_container }};
+		{% endif %}
+
+		proxy_set_header Host $host;
+
+		client_body_buffer_size 25M;
+		client_max_body_size {{ matrix_nginx_proxy_proxy_matrix_federation_api_client_max_body_size_mb }}M;
+		proxy_max_temp_file_size 0;
+	}
+}
+{% endif %}