From 8394abe15a3e4385201af2dee15569bb7e1def22 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 10 Jun 2019 15:28:09 +0200
Subject: [PATCH] Fix #834: Simplified embedded docker reverse proxy IP
 configuration

---
 changes/changelog.d/834.enhancement | 1 +
 deploy/docker.funkwhale_proxy.conf  | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 changes/changelog.d/834.enhancement

diff --git a/changes/changelog.d/834.enhancement b/changes/changelog.d/834.enhancement
new file mode 100644
index 0000000000..58ab1161e5
--- /dev/null
+++ b/changes/changelog.d/834.enhancement
@@ -0,0 +1 @@
+Simplified embedded docker reverse proxy IP configuration (#834)
diff --git a/deploy/docker.funkwhale_proxy.conf b/deploy/docker.funkwhale_proxy.conf
index a1b0a31e5c..dccc782f29 100644
--- a/deploy/docker.funkwhale_proxy.conf
+++ b/deploy/docker.funkwhale_proxy.conf
@@ -4,10 +4,9 @@
 # at https://dev.funkwhale.audio/funkwhale/funkwhale/blob/develop/deploy/funkwhale_proxy.conf
 # your proxy will also need to support websockets
 
-real_ip_header X-Forwarded-For;
-set_real_ip_from 172.17.0.0/16;
+proxy_set_header Host $host;
+proxy_set_header X-Real-IP $remote_addr;
 
-proxy_set_header Host $http_x_forwarded_host;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
 proxy_set_header X-Forwarded-Host $http_x_forwarded_host;
-- 
GitLab