From 7729d91e78799e335dbead19b65bdaac24d5616d Mon Sep 17 00:00:00 2001 From: opi Date: Wed, 2 Mar 2016 12:14:34 +0100 Subject: [PATCH] [fix] Cleaner Nginx redirection rules. Use permanent only when paths match. --- data/templates/nginx/server.conf.sed | 2 +- data/templates/nginx/yunohost_admin.conf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/templates/nginx/server.conf.sed b/data/templates/nginx/server.conf.sed index acd82d177..854ff3faf 100644 --- a/data/templates/nginx/server.conf.sed +++ b/data/templates/nginx/server.conf.sed @@ -8,7 +8,7 @@ server { include conf.d/{{ domain }}.d/*.conf; location /yunohost/admin { - rewrite ^ https://$http_host$request_uri? permanent; + return 301 https://$http_host$request_uri; } access_log /var/log/nginx/{{ domain }}-access.log; diff --git a/data/templates/nginx/yunohost_admin.conf b/data/templates/nginx/yunohost_admin.conf index 722a0dfee..0660eca46 100644 --- a/data/templates/nginx/yunohost_admin.conf +++ b/data/templates/nginx/yunohost_admin.conf @@ -3,11 +3,11 @@ server { listen [::]:80 default_server; location / { - rewrite ^ https://$http_host/yunohost/admin permanent; + return 302 https://$http_host/yunohost/admin; } location /yunohost/admin { - rewrite ^ https://$http_host$request_uri? permanent; + return 301 https://$http_host$request_uri; } } @@ -26,7 +26,7 @@ server { add_header Strict-Transport-Security "max-age=31536000;"; location / { - rewrite ^ https://$http_host/yunohost/admin permanent; + return 302 https://$http_host/yunohost/admin; } # Block crawlers bot