Skip to content

Commit 41513c8

Browse files
authored
In nginx config use $remote_addr (#6574)
1 parent 10d12b8 commit 41513c8

2 files changed

Lines changed: 7 additions & 21 deletions

File tree

docker/federation/nginx.conf

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ http {
3333
}
3434
proxy_pass $proxpass;
3535

36-
proxy_set_header X-Real-IP $remote_addr;
37-
proxy_set_header Host $host;
38-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
36+
proxy_set_header X-Forwarded-For $remote_addr;
3937

4038
# Cuts off the trailing slash on URLs to make them valid
4139
rewrite ^(.+)/+$ $1 permanent;
@@ -72,9 +70,7 @@ http {
7270
}
7371
proxy_pass $proxpass;
7472

75-
proxy_set_header X-Real-IP $remote_addr;
76-
proxy_set_header Host $host;
77-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
73+
proxy_set_header X-Forwarded-For $remote_addr;
7874

7975
# Cuts off the trailing slash on URLs to make them valid
8076
rewrite ^(.+)/+$ $1 permanent;
@@ -111,9 +107,7 @@ http {
111107
}
112108
proxy_pass $proxpass;
113109

114-
proxy_set_header X-Real-IP $remote_addr;
115-
proxy_set_header Host $host;
116-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
110+
proxy_set_header X-Forwarded-For $remote_addr;
117111

118112
# Cuts off the trailing slash on URLs to make them valid
119113
rewrite ^(.+)/+$ $1 permanent;
@@ -150,9 +144,7 @@ http {
150144
}
151145
proxy_pass $proxpass;
152146

153-
proxy_set_header X-Real-IP $remote_addr;
154-
proxy_set_header Host $host;
155-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
147+
proxy_set_header X-Forwarded-For $remote_addr;
156148

157149
# Cuts off the trailing slash on URLs to make them valid
158150
rewrite ^(.+)/+$ $1 permanent;
@@ -189,9 +181,7 @@ http {
189181
}
190182
proxy_pass $proxpass;
191183

192-
proxy_set_header X-Real-IP $remote_addr;
193-
proxy_set_header Host $host;
194-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
184+
proxy_set_header X-Forwarded-For $remote_addr;
195185

196186
# Cuts off the trailing slash on URLs to make them valid
197187
rewrite ^(.+)/+$ $1 permanent;

docker/nginx.conf

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ http {
5050

5151
rewrite ^(.+)/+$ $1 permanent;
5252
# Send actual client IP upstream
53-
proxy_set_header X-Real-IP $remote_addr;
54-
proxy_set_header Host $host;
55-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
53+
proxy_set_header X-Forwarded-For $remote_addr;
5654
}
5755

5856
# backend
@@ -64,9 +62,7 @@ http {
6462
proxy_set_header Connection "upgrade";
6563

6664
# Send actual client IP upstream
67-
proxy_set_header X-Real-IP $remote_addr;
68-
proxy_set_header Host $host;
69-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
65+
proxy_set_header X-Forwarded-For $remote_addr;
7066
}
7167
}
7268
}

0 commit comments

Comments
 (0)