From d1a4c075aaca37cd0084065d773b1574922cbc80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Mon, 25 Jun 2018 14:06:11 +0200
Subject: [PATCH] Changed redirect in Nginx config. Fixed CM APT proxy url.
---
.../5.Nginx/vhost_mediaserver-msuser.conf | 2 +-
2.Common_services/5.Nginx/vhost_msmonitor.conf | 2 +-
2.Common_services/5.Nginx/vhost_skyreach.conf | 10 ++--------
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/2.Common_services/5.Nginx/vhost_mediaserver-msuser.conf b/2.Common_services/5.Nginx/vhost_mediaserver-msuser.conf
index c888525b..ab1fb216 100644
--- a/2.Common_services/5.Nginx/vhost_mediaserver-msuser.conf
+++ b/2.Common_services/5.Nginx/vhost_mediaserver-msuser.conf
@@ -16,7 +16,7 @@ server {
root /tmp/letsencrypt;
}
location / {
- rewrite ^ https://$host$request_uri? permanent;
+ return 301 https://$host$request_uri;
}
}
diff --git a/2.Common_services/5.Nginx/vhost_msmonitor.conf b/2.Common_services/5.Nginx/vhost_msmonitor.conf
index a5f2ff72..39e58ce6 100644
--- a/2.Common_services/5.Nginx/vhost_msmonitor.conf
+++ b/2.Common_services/5.Nginx/vhost_msmonitor.conf
@@ -7,7 +7,7 @@ server {
root /tmp/letsencrypt;
}
location / {
- rewrite ^ https://$host$request_uri? permanent;
+ return 301 https://$host$request_uri;
}
}
diff --git a/2.Common_services/5.Nginx/vhost_skyreach.conf b/2.Common_services/5.Nginx/vhost_skyreach.conf
index b8daaa02..7945e3aa 100644
--- a/2.Common_services/5.Nginx/vhost_skyreach.conf
+++ b/2.Common_services/5.Nginx/vhost_skyreach.conf
@@ -7,7 +7,7 @@ server {
root /tmp/letsencrypt;
}
location / {
- rewrite ^ https://$host$request_uri? permanent;
+ return 301 https://$host$request_uri;
}
}
@@ -67,13 +67,7 @@ server {
}
# APT proxy urls
- location /fr.archive.ubuntu.com/ubuntu {
- proxy_pass http://127.0.0.1:3142;
- }
- location /security.ubuntu.com/ubuntu {
- proxy_pass http://127.0.0.1:3142;
- }
- location /old-releases.ubuntu.com/ubuntu {
+ location ~ /[\w\d\.-_]+.ubuntu.com/ubuntu {
proxy_pass http://127.0.0.1:3142;
}
}
--
GitLab