Update reverse-proxy examples

examples/haproxy/Dockerfile

@@ -1,12 +0,0 @@
-# Pull nginx base image
-FROM nginx:latest
-
-# Expost port 80
-EXPOSE 80
-
-# Copy custom configuration file from the current directory
-COPY nginx.conf /etc/nginx/nginx.conf
-
-# Start up nginx server
-CMD ["nginx"]
-

examples/haproxy/README.md

@@ -3,24 +3,7 @@
 This directory contains sample files that show you how to do reverse-proxying using HAproxy.
 
 This is for when you wish to have your own HAproxy instance sitting in front of Matrix services installed by this playbook.
-See the [Using your own webserver, instead of this playbook's nginx proxy](../../docs/configuring-playbook-own-webserver.md) documentation page.
 
-To use your own HAproxy reverse-proxy, you first need to disable the integrated Nginx server.
-You do that with the following custom configuration (`inventory/host_vars/matrix.<your-domain>/vars.yml`):
-
-```yaml
-matrix_nginx_proxy_enabled: false
-```
+We recommend that you use HAProxy in front of Traefik. See our [Fronting the integrated reverse-proxy webserver with another reverse-proxy](../../docs/configuring-playbook-own-webserver.md#fronting-the-integrated-reverse-proxy-webserver-with-another-reverse-proxy) documentation.
 
 You can then use the configuration files from this directory as an example for how to configure your HAproxy reverse proxy.
-
-**NOTE**: this is just an example and may not be entirely accurate. It may also not cover other use cases or performance needs.
-
-### Configuration
-
-HAproxy, unlike Apache, Nginx and others, does not provide you with a webserver to serve static files (i.e., `/.well-known/` directory). For this reason, in this folder you can find an example on how to use HAproxy together with a simple Nginx container whose only task is to serve those files.
-
-* Build the Docker image. `docker build -t local/nginx .` 
-* Start the container. `docker-compose up -d`. Note that if you want to run Nginx on a different port, you will have to change the port both in the `docker-compose.yml` and in `haproxy.cfg`.
-* If you don't want to use a wildcard certificate, you will need to modify the corresponding line in the HTTPS frontent and add the paths of all the specific certificates (as for the commented example in `haproxy.cfg`).
-* Start HAproxy with the proposed configuration.

examples/haproxy/docker-compose.yml

@@ -1,9 +0,0 @@
----
-version: '3'
-services:
-  nginx:
-    image: local/nginx
-    ports:
-      - 40888:80
-    volumes:
-      - /matrix/static-files:/var/www/:ro

examples/haproxy/haproxy.cfg

@@ -43,29 +43,16 @@ frontend https-frontend
     reqadd X-Forwarded-Proto:\ https
     option httplog
     option http-server-close
-    #
-    # Matrix
-    #
-    # matrix.example.com
+
+    # You can do per-domain routing (as shown above),
+	# or just send everything to the same backend via `default_backend`.
+
     acl matrix_domain hdr_dom(host) -i matrix.example.com
-    acl static_files path -i -m beg /.well-known/matrix
-    use_backend nginx-static if static_files
-    # /_matrix/identity and /_matrix/client/r0/user_directory/search
-    acl matrix_identity path -i -m beg /_matrix/identity
-    acl matrix_search path -i -m beg /_matrix/client/r0/user_directory/search
-    # Send to :8090
-    use_backend matrix-supporting if matrix_identity or matrix_search
-    # /_matrix and /_synapse/admin
-    acl matrix_path path -i -m beg /_matrix
-    acl synapse_admin path -i -m beg /_synapse/admin
-    # Send to :8008
-    use_backend matrix-main if matrix_path or synapse_admin
-    # element.example.com
-    acl element_domain hdr_dom(host) -i element.example.com
-    # Send to 8765
-    use_backend element if element_domain
-    # If nothing else match, just send to default matrix backend
     use_backend matrix-main if matrix_domain
+
+    acl matrix_domain hdr_dom(host) -i element.example.com
+    use_backend matrix-main if matrix_domain
+
     #default_backend matrix-main
 
 frontend matrix-federation
@@ -75,14 +62,11 @@ frontend matrix-federation
   option http-server-close
   default_backend synapse
 
-backend matrix-supporting
-     server matrix-supporting 127.0.0.1:8090 check
-
 backend matrix-main
-     server matrix-main 127.0.0.1:8008 check
+     server matrix-main 127.0.0.1:81 check
 
-backend synapse
-     server synapse 127.0.0.1:8048 check
+backend matrix-federation
+     server matrix-federation 127.0.0.1:8049 check
 
 backend nginx-static
      capture request header origin len 128

examples/haproxy/nginx.conf

@@ -1,15 +0,0 @@
-worker_processes auto;
-daemon off;
-
-events {
-  worker_connections 1024;
-}
-
-http {
-  server_tokens off;
-  server {
-    listen 80;
-    index index.html;
-    root /var/www;
-  }
-}