From 62713f7d0b43a587d14857303ab873779495f8f8 Mon Sep 17 00:00:00 2001
From: Magic_RB <magic_rb@redalder.org>
Date: Thu, 27 Jul 2023 22:25:45 +0200
Subject: [PATCH] Apparently the http_proxy setting for synapse is only an env
 var

Signed-off-by: Magic_RB <magic_rb@redalder.org>
---
 terranix/containers/matrix/matrix-synapse.hcl | 65 ++++++++++++++++---
 1 file changed, 55 insertions(+), 10 deletions(-)

diff --git a/terranix/containers/matrix/matrix-synapse.hcl b/terranix/containers/matrix/matrix-synapse.hcl
index 04293e5..5749ce7 100644
--- a/terranix/containers/matrix/matrix-synapse.hcl
+++ b/terranix/containers/matrix/matrix-synapse.hcl
@@ -211,8 +211,17 @@ EOF
       template {
         data = <<EOF
 {{ with secret "kv/data/cluster/matrix/synapse" }}
-http_proxy: http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
-https_proxy: http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+http_proxy=http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+https_proxy=http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+{{ end }}
+EOF
+        destination = "/secrets/env"
+        env = true
+      }
+
+      template {
+        data = <<EOF
+{{ with secret "kv/data/cluster/matrix/synapse" }}
 worker_name: "worker-client-{{ env "NOMAD_ALLOC_INDEX" }}"
 registration_shared_secret: "{{ .Data.data.registration_shared_secret }}"
 macaroon_secret_key: "{{ .Data.data.macaroon_secret_key }}"
@@ -359,8 +368,17 @@ EOF
       template {
         data = <<EOF
 {{ with secret "kv/data/cluster/matrix/synapse" }}
-http_proxy: http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
-https_proxy: http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+http_proxy=http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+https_proxy=http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+{{ end }}
+EOF
+        destination = "/secrets/env"
+        env = true
+      }
+
+      template {
+        data = <<EOF
+{{ with secret "kv/data/cluster/matrix/synapse" }}
 worker_name: "worker-sync-{{ env "NOMAD_ALLOC_INDEX" }}"
 registration_shared_secret: "{{ .Data.data.registration_shared_secret }}"
 macaroon_secret_key: "{{ .Data.data.macaroon_secret_key }}"
@@ -507,8 +525,17 @@ EOF
       template {
         data = <<EOF
 {{ with secret "kv/data/cluster/matrix/synapse" }}
-http_proxy: http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
-https_proxy: http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+http_proxy=http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+https_proxy=http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+{{ end }}
+EOF
+        destination = "/secrets/env"
+        env = true
+      }
+
+      template {
+        data = <<EOF
+{{ with secret "kv/data/cluster/matrix/synapse" }}
 worker_name: "worker-federation-receiver-{{ env "NOMAD_ALLOC_INDEX" }}"
 registration_shared_secret: "{{ .Data.data.registration_shared_secret }}"
 macaroon_secret_key: "{{ .Data.data.macaroon_secret_key }}"
@@ -655,8 +682,17 @@ EOF
       template {
         data = <<EOF
 {{ with secret "kv/data/cluster/matrix/synapse" }}
-http_proxy: http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
-https_proxy: http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+http_proxy=http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+https_proxy=http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+{{ end }}
+EOF
+        destination = "/secrets/env"
+        env = true
+      }
+
+      template {
+        data = <<EOF
+{{ with secret "kv/data/cluster/matrix/synapse" }}
 worker_name: "worker-federation-sender-{{ env "NOMAD_ALLOC_INDEX" }}"
 registration_shared_secret: "{{ .Data.data.registration_shared_secret }}"
 macaroon_secret_key: "{{ .Data.data.macaroon_secret_key }}"
@@ -889,8 +925,17 @@ EOF
       template {
         data = <<EOF
 {{ with secret "kv/data/cluster/matrix/synapse" }}
-http_proxy: http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
-https_proxy: http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+http_proxy=http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+https_proxy=http://synapse:{{ .Data.data.proxy_pass }}@synapse-proxy.in.redalder.org:8883/
+{{ end }}
+EOF
+        destination = "/secrets/env"
+        env = true
+      }
+
+      template {
+        data = <<EOF
+{{ with secret "kv/data/cluster/matrix/synapse" }}
 registration_shared_secret: "{{ .Data.data.registration_shared_secret }}"
 macaroon_secret_key: "{{ .Data.data.macaroon_secret_key }}"
 form_secret: "{{ .Data.data.form_secret }}"