chore(compose): chat front-end was 503

Author: pm-McFly

.compose/chat/config.json

@@ -12,6 +12,7 @@
   "platform": "localDebug",
   "default_max_upload_avatar_size_in_bytes": 1000000,
   "dev_mode": true,
+  "qr_code_download_url": "https://sign-up.twake.app/download/chat",
   "enable_logs": true,
   "support_url": "https://twake.app/support"
 }

.compose/chat/default.conf.template

@@ -143,6 +143,10 @@ services:
       - MATRIX_DATABASE_USER=synapse
       - MATRIX_DATABASE_PASSWORD=synapse!1
 
+      - SMS_API_KEY=SOME_SECRET_KEY
+      - [email protected]
+      - SMS_API_URL=https://api.octopush.com/v1/public
+
       - LOG_LEVEL=silly
       - LOG_TRANSPORTS=Console
 
@@ -200,12 +204,9 @@ services:
     image: linagora/twake-web
     volumes:
       - ../chat/config.json:/usr/share/nginx/html/web/config.json
-      - ../chat/default.conf.template:/etc/nginx/templates/default.conf.template
       - ../ssl:/etc/nginx/ssl
     # ports:
-    #   - 6868:6868
-    environment:
-      - TWAKECHAT_LISTEN_PORT=6868
+    #   - 80:80
     networks:
       - frontend
 
@@ -221,8 +222,13 @@ services:
     ports:
       - 443:443
     volumes:
-      - ../haproxy:/usr/local/etc/haproxy
+      # Reverse proxy routing configuration
       - ../haproxy/haproxy.tom+fed+chat+admin.cfg:/usr/local/etc/haproxy/haproxy.cfg
+      - ../haproxy/cors.lua:/usr/local/etc/haproxy/cors.lua
+      - ../haproxy/lua_endpoint_to_function.map_rewrite.cfg:/usr/local/etc/haproxy/lua_endpoint_to_function.map_rewrite.cfg
+      - ../haproxy/lua_endpoint_to_worker.map_rewrite.lua:/usr/local/etc/haproxy/lua_endpoint_to_worker.map_rewrite.lua
+      - ../haproxy/synapse_worker_endpoint_indexer.lua:/usr/local/etc/haproxy/synapse_worker_endpoint_indexer.lua
+      # HTTPS SSL Certs
       - ../ssl/both.pem:/etc/ssl/certs/both.pem
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0

.compose/examples/tom+fed+chat+admin.pgsql+ldap.yml

@@ -135,23 +135,16 @@ services:
       # - USERDB_ENGINE=sqlite                  ## Uncomment to enable local userDB
       # - USERDB_HOST=/opt/lemon/db/lemon.db    ## Uncomment to enable local userDB
 
-      - SMS_API_KEY=SOME_SECRET_KEY
-      - [email protected]
-      - SMS_API_URL=https://api.octopush.com/v1/public
-
       - LOG_LEVEL=silly
       - LOG_TRANSPORTS=Console
 
   chat:
     image: linagora/twake-web
     volumes:
       - ../chat/config.json:/usr/share/nginx/html/web/config.json
-      - ../chat/default.conf.template:/etc/nginx/templates/default.conf.template
       - ../ssl:/etc/nginx/ssl
     # ports:
-    #   - 6868:6868
-    environment:
-      - TWAKECHAT_LISTEN_PORT=6868
+    #   - 80:80
     networks:
       - frontend
 
@@ -167,8 +160,13 @@ services:
     ports:
       - 443:443
     volumes:
-      - ../haproxy:/usr/local/etc/haproxy
+      # Reverse proxy routing configuration
       - ../haproxy/haproxy.tom+fed+chat+admin.cfg:/usr/local/etc/haproxy/haproxy.cfg
+      - ../haproxy/cors.lua:/usr/local/etc/haproxy/cors.lua
+      - ../haproxy/lua_endpoint_to_function.map_rewrite.cfg:/usr/local/etc/haproxy/lua_endpoint_to_function.map_rewrite.cfg
+      - ../haproxy/lua_endpoint_to_worker.map_rewrite.lua:/usr/local/etc/haproxy/lua_endpoint_to_worker.map_rewrite.lua
+      - ../haproxy/synapse_worker_endpoint_indexer.lua:/usr/local/etc/haproxy/synapse_worker_endpoint_indexer.lua
+      # HTTPS SSL Certs
       - ../ssl/both.pem:/etc/ssl/certs/both.pem
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0

.compose/examples/tom+fed+chat+admin.sqlite.yml

@@ -143,6 +143,10 @@ services:
       - MATRIX_DATABASE_USER=synapse
       - MATRIX_DATABASE_PASSWORD=synapse!1
 
+      - SMS_API_KEY=SOME_SECRET_KEY
+      - [email protected]
+      - SMS_API_URL=https://api.octopush.com/v1/public
+
       - LOG_LEVEL=silly
       - LOG_TRANSPORTS=Console
 
@@ -200,12 +204,9 @@ services:
     image: linagora/twake-web
     volumes:
       - ../chat/config.json:/usr/share/nginx/html/web/config.json
-      - ../chat/default.conf.template:/etc/nginx/templates/default.conf.template
       - ../ssl:/etc/nginx/ssl
     # ports:
-    #   - 6868:6868
-    environment:
-      - TWAKECHAT_LISTEN_PORT=6868
+    #   - 80:80
     networks:
       - frontend
 
@@ -214,8 +215,13 @@ services:
     ports:
       - 443:443
     volumes:
-      - ../haproxy:/usr/local/etc/haproxy
+      # Reverse proxy routing configuration
       - ../haproxy/haproxy.tom+fed+chat.cfg:/usr/local/etc/haproxy/haproxy.cfg
+      - ../haproxy/cors.lua:/usr/local/etc/haproxy/cors.lua
+      - ../haproxy/lua_endpoint_to_function.map_rewrite.cfg:/usr/local/etc/haproxy/lua_endpoint_to_function.map_rewrite.cfg
+      - ../haproxy/lua_endpoint_to_worker.map_rewrite.lua:/usr/local/etc/haproxy/lua_endpoint_to_worker.map_rewrite.lua
+      - ../haproxy/synapse_worker_endpoint_indexer.lua:/usr/local/etc/haproxy/synapse_worker_endpoint_indexer.lua
+      # HTTPS SSL Certs
       - ../ssl/both.pem:/etc/ssl/certs/both.pem
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0

.compose/examples/tom+fed+chat.pgsql+ldap.yml

@@ -135,23 +135,16 @@ services:
       # - USERDB_ENGINE=sqlite                  ## Uncomment to enable local userDB
       # - USERDB_HOST=/opt/lemon/db/lemon.db    ## Uncomment to enable local userDB
 
-      - SMS_API_KEY=SOME_SECRET_KEY
-      - [email protected]
-      - SMS_API_URL=https://api.octopush.com/v1/public
-
       - LOG_LEVEL=silly
       - LOG_TRANSPORTS=Console
 
   chat:
     image: linagora/twake-web
     volumes:
       - ../chat/config.json:/usr/share/nginx/html/web/config.json
-      - ../chat/default.conf.template:/etc/nginx/templates/default.conf.template
       - ../ssl:/etc/nginx/ssl
     # ports:
-    #   - 6868:6868
-    environment:
-      - TWAKECHAT_LISTEN_PORT=6868
+    #   - 80:80
     networks:
       - frontend
 
@@ -160,8 +153,13 @@ services:
     ports:
       - 443:443
     volumes:
-      - ../haproxy:/usr/local/etc/haproxy
+      # Reverse proxy routing configuration
       - ../haproxy/haproxy.tom+fed+chat.cfg:/usr/local/etc/haproxy/haproxy.cfg
+      - ../haproxy/cors.lua:/usr/local/etc/haproxy/cors.lua
+      - ../haproxy/lua_endpoint_to_function.map_rewrite.cfg:/usr/local/etc/haproxy/lua_endpoint_to_function.map_rewrite.cfg
+      - ../haproxy/lua_endpoint_to_worker.map_rewrite.lua:/usr/local/etc/haproxy/lua_endpoint_to_worker.map_rewrite.lua
+      - ../haproxy/synapse_worker_endpoint_indexer.lua:/usr/local/etc/haproxy/synapse_worker_endpoint_indexer.lua
+      # HTTPS SSL Certs
       - ../ssl/both.pem:/etc/ssl/certs/both.pem
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0

.compose/examples/tom+fed+chat.sqlite.yml

@@ -40,8 +40,14 @@ frontend http-in
    acl is_fed hdr_end(host) -i fed.docker.localhost
    use_backend fed if is_fed
 
-   acl is_chat hdr_end(host) -i chat.docker.localhost
-   use_backend chat if is_chat
+    acl is_chat hdr(host) -i chat.docker.localhost
+
+    # If the host is chat.docker.localhost AND the path is exactly '/'
+    # Then redirect to https://chat.docker.localhost/web/ with a 301 Permanent Redirect
+    http-request redirect location https://chat.docker.localhost/web/ code 301 if is_chat { path eq / }
+
+    # Rule to send traffic for chat.docker.localhost to the chat backend
+    use_backend chat if is_chat
 
    acl is_admin hdr_end(host) -i admin.docker.localhost
    use_backend admin if is_admin
@@ -80,7 +86,7 @@ backend chat
    balance roundrobin
    option forwardfor
    http-request set-header X-Forwarded-Proto https
-   server node1 chat:6868 check
+   server node1 chat:80 check
 
 backend admin
    balance roundrobin

.compose/haproxy/haproxy.tom+fed+chat+admin.cfg

@@ -40,8 +40,14 @@ frontend http-in
    acl is_fed hdr_end(host) -i fed.docker.localhost
    use_backend fed if is_fed
 
-   acl is_chat hdr_end(host) -i chat.docker.localhost
-   use_backend chat if is_chat
+    acl is_chat hdr(host) -i chat.docker.localhost
+
+    # If the host is chat.docker.localhost AND the path is exactly '/'
+    # Then redirect to https://chat.docker.localhost/web/ with a 301 Permanent Redirect
+    http-request redirect location https://chat.docker.localhost/web/ code 301 if is_chat { path eq / }
+
+    # Rule to send traffic for chat.docker.localhost to the chat backend
+    use_backend chat if is_chat
 
    acl is_portal hdr_end(host) -i auth.docker.localhost
    acl is_portal hdr_end(host) -i docker.localhost
@@ -77,4 +83,4 @@ backend chat
    balance roundrobin
    option forwardfor
    http-request set-header X-Forwarded-Proto https
-   server node1 chat:6868 check
+   server node1 chat:80 check

.compose/haproxy/haproxy.tom+fed+chat.cfg

@@ -134,23 +134,16 @@ services:
       # - USERDB_ENGINE=sqlite                  ## Uncomment to enable local userDB
       # - USERDB_HOST=/opt/lemon/db/lemon.db    ## Uncomment to enable local userDB
 
-      - SMS_API_KEY=SOME_SECRET_KEY
-      - [email protected]
-      - SMS_API_URL=https://api.octopush.com/v1/public
-
       - LOG_LEVEL=silly
       - LOG_TRANSPORTS=Console
 
   chat:
     image: linagora/twake-web
     volumes:
       - ./.compose/chat/config.json:/usr/share/nginx/html/web/config.json
-      - ./.compose/chat/default.conf.template:/etc/nginx/templates/default.conf.template
       - ./.compose/ssl:/etc/nginx/ssl
     # ports:
-    #   - 6868:6868
-    environment:
-      - TWAKECHAT_LISTEN_PORT=6868
+    #   - 80:80
     networks:
       - frontend
 
@@ -159,8 +152,13 @@ services:
     ports:
       - 443:443
     volumes:
-      - ./.compose/haproxy:/usr/local/etc/haproxy
+      # Reverse proxy routing configuration
       - ./.compose/haproxy/haproxy.tom+fed+chat.cfg:/usr/local/etc/haproxy/haproxy.cfg
+      - ./.compose/haproxy/cors.lua:/usr/local/etc/haproxy/cors.lua
+      - ./.compose/haproxy/lua_endpoint_to_function.map_rewrite.cfg:/usr/local/etc/haproxy/lua_endpoint_to_function.map_rewrite.cfg
+      - ./.compose/haproxy/lua_endpoint_to_worker.map_rewrite.lua:/usr/local/etc/haproxy/lua_endpoint_to_worker.map_rewrite.lua
+      - ./.compose/haproxy/synapse_worker_endpoint_indexer.lua:/usr/local/etc/haproxy/synapse_worker_endpoint_indexer.lua
+      # HTTPS SSL Certs
       - ./.compose/ssl/both.pem:/etc/ssl/certs/both.pem
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0