From 6054b7a54500999f36edb74e692703a2179739eb Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 4 Mar 2021 10:56:01 +0100 Subject: [PATCH] [nginx] P-Real-IP -> X-Real-IP Signed-off-by: Yohann D'ANELLO --- roles/nginx/templates/nginx/sites-available/redirect.j2 | 8 ++++---- .../nginx/templates/nginx/sites-available/reverseproxy.j2 | 4 ++-- .../nginx/sites-available/reverseproxy_redirect_dname.j2 | 4 ++-- roles/nginx/templates/nginx/sites-available/service.j2 | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/nginx/templates/nginx/sites-available/redirect.j2 b/roles/nginx/templates/nginx/sites-available/redirect.j2 index d40a3a4b..0c9a380e 100644 --- a/roles/nginx/templates/nginx/sites-available/redirect.j2 +++ b/roles/nginx/templates/nginx/sites-available/redirect.j2 @@ -11,7 +11,7 @@ server { {% for realip in nginx.real_ip_from %} set_real_ip_from {{ realip }}; {% endfor %} - real_ip_header P-Real-Ip; + real_ip_header X-Real-Ip; location / { return 302 http://{{ site.to }}$request_uri; @@ -31,7 +31,7 @@ server { {% for realip in nginx.real_ip_from %} set_real_ip_from {{ realip }}; {% endfor %} - real_ip_header P-Real-Ip; + real_ip_header X-Real-Ip; location / { return 302 https://{{ site.to }}$request_uri; @@ -55,7 +55,7 @@ server { {% for realip in nginx.real_ip_from %} set_real_ip_from {{ realip }}; {% endfor %} - real_ip_header P-Real-Ip; + real_ip_header X-Real-Ip; location / { return 302 http://{{ site.to }}$request_uri; @@ -75,7 +75,7 @@ server { {% for realip in nginx.real_ip_from %} set_real_ip_from {{ realip }}; {% endfor %} - real_ip_header P-Real-Ip; + real_ip_header X-Real-Ip; location / { return 302 https://{{ site.to }}$request_uri; diff --git a/roles/nginx/templates/nginx/sites-available/reverseproxy.j2 b/roles/nginx/templates/nginx/sites-available/reverseproxy.j2 index 27013aab..8f2c95b8 100644 --- a/roles/nginx/templates/nginx/sites-available/reverseproxy.j2 +++ b/roles/nginx/templates/nginx/sites-available/reverseproxy.j2 @@ -18,7 +18,7 @@ server { {% for realip in nginx.real_ip_from %} set_real_ip_from {{ realip }}; {% endfor %} - real_ip_header P-Real-Ip; + real_ip_header X-Real-Ip; location / { return 302 https://$host$request_uri; @@ -51,7 +51,7 @@ server { {% for realip in nginx.real_ip_from %} set_real_ip_from {{ realip }}; {% endfor %} - real_ip_header P-Real-Ip; + real_ip_header X-Real-Ip; location / { proxy_pass http://{{ site.to }}; diff --git a/roles/nginx/templates/nginx/sites-available/reverseproxy_redirect_dname.j2 b/roles/nginx/templates/nginx/sites-available/reverseproxy_redirect_dname.j2 index 0b39022f..e5bd27be 100644 --- a/roles/nginx/templates/nginx/sites-available/reverseproxy_redirect_dname.j2 +++ b/roles/nginx/templates/nginx/sites-available/reverseproxy_redirect_dname.j2 @@ -15,7 +15,7 @@ server { {% for realip in nginx.real_ip_from %} set_real_ip_from {{ realip }}; {% endfor %} - real_ip_header P-Real-Ip; + real_ip_header X-Real-Ip; location / { return 302 http://{{ to }}$request_uri; @@ -35,7 +35,7 @@ server { {% for realip in nginx.real_ip_from %} set_real_ip_from {{ realip }}; {% endfor %} - real_ip_header P-Real-Ip; + real_ip_header X-Real-Ip; location / { return 302 https://{{ to }}$request_uri; diff --git a/roles/nginx/templates/nginx/sites-available/service.j2 b/roles/nginx/templates/nginx/sites-available/service.j2 index 7c7244ab..297d069d 100644 --- a/roles/nginx/templates/nginx/sites-available/service.j2 +++ b/roles/nginx/templates/nginx/sites-available/service.j2 @@ -30,7 +30,7 @@ server { {% for realip in nginx.real_ip_from %} set_real_ip_from {{ realip }}; {% endfor %} - real_ip_header P-Real-Ip; + real_ip_header X-Real-Ip; location / { return 302 https://{{ nginx.default_ssl_server }}$request_uri; @@ -53,7 +53,7 @@ server { {% for realip in nginx.real_ip_from %} set_real_ip_from {{ realip }}; {% endfor %} - real_ip_header P-Real-Ip; + real_ip_header X-Real-Ip; location / { return 302 http://{{ nginx.default_server }}$request_uri; @@ -77,7 +77,7 @@ server { {% for realip in nginx.real_ip_from %} set_real_ip_from {{ realip }}; {% endfor %} - real_ip_header P-Real-Ip; + real_ip_header X-Real-Ip; location / { return 302 https://$host$request_uri; @@ -104,7 +104,7 @@ server { {% for realip in nginx.real_ip_from %} set_real_ip_from {{ realip }}; {% endfor %} - real_ip_header P-Real-Ip; + real_ip_header X-Real-Ip; {% if server.root is defined %}root {{ server.root }};{% endif %} {% if server.index is defined %}index {{ server.index|join(" ") }};{% endif %}