Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

feat(helm): add edge tls directive and conf.d caddy imports

Hampus49efa5929581
diff --git a/deploy/helm/fluxer/files/Caddyfile b/deploy/helm/fluxer/files/Caddyfile
index e3b14ad99..3e94e2fb5 100644
--- a/deploy/helm/fluxer/files/Caddyfile
+++ b/deploy/helm/fluxer/files/Caddyfile
@@ -7,6 +7,8 @@
}
{$FLUXER_EDGE_SITE_ADDRESS} {
+ {$FLUXER_EDGE_TLS_DIRECTIVE}
+ import /etc/caddy/conf.d/*.caddy
encode {$FLUXER_EDGE_ENCODE:zstd gzip}
handle /_health {
diff --git a/deploy/helm/fluxer/templates/edge.yaml b/deploy/helm/fluxer/templates/edge.yaml
index 3edc5c79d..d6b3fa1d9 100644
--- a/deploy/helm/fluxer/templates/edge.yaml
+++ b/deploy/helm/fluxer/templates/edge.yaml
@@ -3,7 +3,7 @@
{{- $e := $v.edge }}
{{- $ctx := dict "root" . "name" "edge" "component" "edge" "w" $e }}
{{- $lb := eq $e.expose "loadBalancer" }}
-{{- $caddyfile := .Files.Get "files/Caddyfile" }}
+{{- $caddyfile := .Files.Get "files/Caddyfile" | replace "\r" "" }}
{{- $globalOptions := ternary (printf "email %s" $v.email) "" (and $lb (ne $v.email "")) }}
{{- $siteAddress := ternary (printf "https://%s, :8080" $v.domain) ":8080" $lb }}
{{- $trusted := ternary "127.0.0.1/32" "private_ranges" $lb }}