rewrite to forwarded scheme

ans-group · Nov 22, 2023 · db7446e · db7446e
1 parent a499dcb
commit db7446e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.ci/kustomize/base/app-ingress-ans.yaml b/.ci/kustomize/base/app-ingress-ans.yaml
@@ -4,7 +4,6 @@ kind: Ingress
 metadata:
   name: app-ingress-ans
   annotations:
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
     cert-manager.io/cluster-issuer: letsencrypt-http
 spec:
   rules:

diff --git a/.ci/kustomize/base/app-ingress.yaml b/.ci/kustomize/base/app-ingress.yaml
@@ -3,8 +3,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: app-ingress
-  annotations:
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
 spec:
   rules:
   - host: docs.ukfast.co.uk

diff --git a/.ci/kustomize/overlays/uat/app-ingress.yaml b/.ci/kustomize/overlays/uat/app-ingress.yaml
@@ -3,8 +3,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: app-ingress
-  annotations:
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
 spec:
   rules:
   - host: REPLACE_ME

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -24,6 +24,11 @@ http {
     # See http://nginx.org/en/docs/ngx_core_module.html#include
     # for more information.
 
+    map $http_x_forwarded_proto $http_scheme {
+        default "http";
+        https   "https";
+    }
+
     server {
         listen       80 default_server;
         listen       [::]:80 default_server;
@@ -38,17 +43,17 @@ http {
             proxy_pass http://elasticsearch:9200/;
         }
 
-        rewrite ^(?!(\/docs|\/search))\/(.*)$ /docs/$2 permanent;
-        rewrite ^\/docs\/(((?!index).)*)\.html$ /docs/$1/ permanent;
-
-        rewrite ^/docs/cloud/(.*)$ /docs/ecloud/$1 permanent;
-        rewrite ^/docs/ecloud/hybridandprivate/(.*)$ /docs/ecloud/private/$1 permanent;
-        rewrite ^/docs/Domains/(.*)$ /docs/domains/$1 permanent;
-        rewrite ^/docs/ecommercestacks/magento/magento2/nginxphpfilewhitelist.html /docs/ecommercestacks/magento/magento2/nginxphpfileallowlist.html permanent;
-        rewrite ^/docs/operatingsystems/linux/mail/blacklists.html /docs/email/blocklists.html permanent;
-        rewrite ^/docs/security/threatmonitoring/alert-remediation-tips/ip-whitelist.html /docs/security/threatmonitoring/alert-remediation-tips/ip-allowlist.html permanent;
-        rewrite ^/docs/operatingsystems/linux/mail/(.*)$ /docs/email/$1 permanent;
-        rewrite ^/docs/operatingsystems/windows/hmail/antispamsetup.html /docs/email/hmail-antispam-setup.html permanent;
+        rewrite ^(?!(\/docs|\/search))\/(.*)$ $http_scheme://$host/docs/$2 permanent;
+        rewrite ^\/docs\/(((?!index).)*)\.html$ $http_scheme://$host/docs/$1/ permanent;
+
+        rewrite ^/docs/cloud/(.*)$ $http_scheme://$host/docs/ecloud/$1 permanent;
+        rewrite ^/docs/ecloud/hybridandprivate/(.*)$ $http_scheme://$host/docs/ecloud/private/$1 permanent;
+        rewrite ^/docs/Domains/(.*)$ $http_scheme://$host/docs/domains/$1 permanent;
+        rewrite ^/docs/ecommercestacks/magento/magento2/nginxphpfilewhitelist.html $http_scheme://$host/docs/ecommercestacks/magento/magento2/nginxphpfileallowlist.html permanent;
+        rewrite ^/docs/operatingsystems/linux/mail/blacklists.html $http_scheme://$host/docs/email/blocklists.html permanent;
+        rewrite ^/docs/security/threatmonitoring/alert-remediation-tips/ip-whitelist.html $http_scheme://$host/docs/security/threatmonitoring/alert-remediation-tips/ip-allowlist.html permanent;
+        rewrite ^/docs/operatingsystems/linux/mail/(.*)$ $http_scheme://$host/docs/email/$1 permanent;
+        rewrite ^/docs/operatingsystems/windows/hmail/antispamsetup.html $http_scheme://$host/docs/email/hmail-antispam-setup.html permanent;
 
         location /docs/robots.txt {
             alias /usr/share/nginx/docs.ukfast.co.uk/html/docs/_static/robots.txt;