Add args to nginx redirect map. #129

images/nginx/Dockerfile

@@ -36,6 +36,7 @@ COPY fastcgi.conf /etc/nginx/fastcgi_params
 COPY helpers/ /etc/nginx/helpers/
 COPY static-files.conf /etc/nginx/conf.d/app.conf
 COPY redirects-map.conf /etc/nginx/redirects-map.conf
+COPY redirects-map-args.conf /etc/nginx/redirects-map-args.conf
 COPY healthcheck/healthz.locations healthcheck/healthz.locations.php.disable /etc/nginx/conf.d/
 
 RUN mkdir -p /app \

images/nginx/helpers/010_redirects.conf

@@ -1,4 +1,7 @@
 # $redirectdomain is set via the redirects-map.conf within nginx.conf
 if ($redirectdomain) {
     return 301 $redirectdomain;
-}
+}
+if ($redirectdomainargs) {
+    return 301 $redirectdomainargs;
+}

images/nginx/nginx.conf

@@ -36,6 +36,10 @@ http {
     map_hash_max_size ${NGINX_HASH_MAP_SIZE:-64};
     map_hash_bucket_size ${NGINX_HASH_BUCKET_SIZE:-64};
 
+    map $host$uri$args $redirectdomainargs {
+        include /etc/nginx/redirects-map-args.conf;
+    }
+
     map $host$uri $redirectdomain {
         include /etc/nginx/redirects-map.conf;
     }

images/nginx/redirects-map-args.conf

@@ -0,0 +1,18 @@
+## Nginx redirect map args
+## This file is expected to have two entries per line:
+## 1. source, which will be matched against '$host$uri$args' from nginx (so the hostname, uri and arguments)
+## 2. destination of the redirect
+## The file is read from top to bottom, so more specific sources need to be above more general matches
+## A couple of examples:
+
+## Simple redirect matching a specific argument and value
+# ~^example\.com\/?somekey=somevalue$   https://example.net;
+
+## Simple redirect matching a specific argument and value, preserving the arguments
+# ~^example\.com\/?somekey=somevalue$   https://example.net$args;
+
+## Simple redirect matching a request that starts with a specific argument and value, preserving the arguments
+# ~^example\.com\/?somekey=somevalue   https://example.net$args;
+
+## Simple redirect matching a request that starts with a specific argument and value, preserving the URI and arguments
+# ~^example\.com\/some/other/test?somekey=somevalue   https://example.net$request_uri;