From e5bca60eb98d76b32388a98418ab6fa3e0eff357 Mon Sep 17 00:00:00 2001
From: Elizabeth Hunt <me@liz.coffee>
Date: Thu, 1 May 2025 23:07:54 -0700
Subject: Fix real ip's from upstream proxies

---
 playbooks/roles/nginx-proxy/templates/docker-compose.yml          | 3 +++
 playbooks/roles/nginx-proxy/templates/toplevel.conf.d/stream.conf | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'playbooks/roles/nginx-proxy')

diff --git a/playbooks/roles/nginx-proxy/templates/docker-compose.yml b/playbooks/roles/nginx-proxy/templates/docker-compose.yml
index 77eda61..33b3243 100644
--- a/playbooks/roles/nginx-proxy/templates/docker-compose.yml
+++ b/playbooks/roles/nginx-proxy/templates/docker-compose.yml
@@ -25,6 +25,9 @@ services:
     environment:
       - TZ={{ timezone }}
       - DEPLOYMENT_TIME={{ deployment_time }}
+      - NO_COLOR=1
+      - LOG_JSON=true
+      - TRUST_DOWNSTREAM_PROXY=false
     networks:
       - proxy
     labels:
diff --git a/playbooks/roles/nginx-proxy/templates/toplevel.conf.d/stream.conf b/playbooks/roles/nginx-proxy/templates/toplevel.conf.d/stream.conf
index fdf1a88..3e7c125 100644
--- a/playbooks/roles/nginx-proxy/templates/toplevel.conf.d/stream.conf
+++ b/playbooks/roles/nginx-proxy/templates/toplevel.conf.d/stream.conf
@@ -1,9 +1,6 @@
 {% if not homelab_build %}
 
 stream {
-    log_format basic '$proxy_protocol_addr - [$time_local] '
-                     '$protocol $status $bytes_sent $bytes_received '
-                     '$session_time';
     upstream imaps {
         server {{ vpn_proxy_filter_container_name }}:993;
     }
-- 
cgit v1.2.3-70-g09d2