aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorADRN <adrien@luxeylab.net>2024-01-22 20:24:46 +0100
committerADRN <adrien@luxeylab.net>2024-01-22 20:24:46 +0100
commit3e93d193476d3f87d0a9d6208766380d324331e4 (patch)
treee555c4f114e200b650d3d9fad3f0be3548d22497
parentdf7301e97a03a73c87c0f5be62793121a2e38245 (diff)
downloadnixcfg-3e93d193476d3f87d0a9d6208766380d324331e4.tar.gz
nixcfg-3e93d193476d3f87d0a9d6208766380d324331e4.zip
the android bridge to android7 works, but Element does not. Solution is to use FluffyChat that embarks its own crypto. We will not mergefeat/im-tls-proxy
-rw-r--r--.gitignore1
-rw-r--r--cluster/prod/app/matrix/deploy/im-android7.hcl8
2 files changed, 5 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 98ba037..f8a6632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ secrets/*
cluster/*/secrets/*
!cluster/*/secrets/*.sample
+bugs/
diff --git a/cluster/prod/app/matrix/deploy/im-android7.hcl b/cluster/prod/app/matrix/deploy/im-android7.hcl
index d78e2db..fecaaae 100644
--- a/cluster/prod/app/matrix/deploy/im-android7.hcl
+++ b/cluster/prod/app/matrix/deploy/im-android7.hcl
@@ -11,7 +11,7 @@ job "im-android7" {
group "rsa-ecc-proxy" {
network {
- port "api_port" { static = 8008 }
+ port "api_port" { static = 18008 }
// port "web_port" { to = 8043 }
}
@@ -23,8 +23,8 @@ job "im-android7" {
ports = [ "api_port" ]
network_mode = "host"
args = [
- "openssl-listen:8008,reuseaddr,fork,verify=0,bind=0.0.0.0,cert=/var/secrets/rsa.crt,key=/var/secrets/rsa.key",
- "openssl:im.deuxfleurs.fr:8008,verify=0",
+ "openssl-listen:18008,reuseaddr,fork,verify=0,bind=0.0.0.0,cert=/var/secrets/rsa.crt,key=/var/secrets/rsa.key",
+ "tcp:synapse.service.prod.consul:8008",
]
volumes = [
"secrets/certs:/var/secrets"
@@ -51,7 +51,7 @@ job "im-android7" {
address_mode = "host"
tags = [
"rsa-ecc-proxy",
- "(diplonat (tcp_port 8008))",
+ "(diplonat (tcp_port 18008))",
"d53-a im-android7.deuxfleurs.fr",
# ipv6 is commented for now as socat does not listen on ipv6 now
# "d53-aaaa im-android7.deuxfleurs.fr"