From 22cfac44203f061f8c67ad33e3555aff870158b9 Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Mon, 12 Apr 2021 08:40:40 +0100
Subject: [PATCH] Avoid needless regex on 301 rewrites

Closes: #278

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
---
 roles/aurweb/templates/nginx.d.conf.j2   | 2 +-
 roles/fluxbb/templates/nginx.conf.j2     | 2 +-
 roles/hedgedoc/templates/nginx.d.conf.j2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/aurweb/templates/nginx.d.conf.j2 b/roles/aurweb/templates/nginx.d.conf.j2
index 9d2608471..d4fce5163 100644
--- a/roles/aurweb/templates/nginx.d.conf.j2
+++ b/roles/aurweb/templates/nginx.d.conf.j2
@@ -22,7 +22,7 @@ server {
     include snippets/letsencrypt.conf;
 
     location / {
-        rewrite ^(.*) https://{{ aurweb_domain }}$1 permanent;
+        return 301 https://$server_name$request_uri;
     }
 }
 
diff --git a/roles/fluxbb/templates/nginx.conf.j2 b/roles/fluxbb/templates/nginx.conf.j2
index 29f840de9..1c81bd6be 100644
--- a/roles/fluxbb/templates/nginx.conf.j2
+++ b/roles/fluxbb/templates/nginx.conf.j2
@@ -10,7 +10,7 @@ server {
     include snippets/letsencrypt.conf;
 
     location / {
-        rewrite ^(.*) https://{{ fluxbb_domain }}$1 permanent;
+        return 301 https://$server_name$request_uri;
     }
 }
 
diff --git a/roles/hedgedoc/templates/nginx.d.conf.j2 b/roles/hedgedoc/templates/nginx.d.conf.j2
index 1faac68d3..66f41d901 100644
--- a/roles/hedgedoc/templates/nginx.d.conf.j2
+++ b/roles/hedgedoc/templates/nginx.d.conf.j2
@@ -19,7 +19,7 @@ server {
     include snippets/letsencrypt.conf;
 
     location / {
-        rewrite ^(.*) https://{{ hedgedoc_domain }}$1 permanent;
+        return 301 https://$server_name$request_uri;
     }
 }
 
-- 
GitLab