From 9bae6088b58fe69440fc75aecf5f272a9b225525 Mon Sep 17 00:00:00 2001
From: Martin van Es <martin@mrvanes.com>
Date: Mon, 21 Feb 2022 11:16:23 +0100
Subject: [PATCH] Add nl specific DNS for proxy-test and proxy-edugain. Fix
 apache md conf.

---
 files/srv.mdx.incubator.geant.org.yaml | 6 ++++++
 roles/apache/templates/md.conf.j2      | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/files/srv.mdx.incubator.geant.org.yaml b/files/srv.mdx.incubator.geant.org.yaml
index c0d0c0f..4b666fe 100644
--- a/files/srv.mdx.incubator.geant.org.yaml
+++ b/files/srv.mdx.incubator.geant.org.yaml
@@ -69,3 +69,9 @@ data:
       - [ "193.224.22.78" ]
       - [ "145.100.180.185" ]
       - [ "62.217.72.109" ]
+  "proxy-edugain.nl":
+    "a":
+      - [ "62.217.72.109" ]
+  "proxy-test.nl":
+    "a":
+      - [ "62.217.72.109" ]
diff --git a/roles/apache/templates/md.conf.j2 b/roles/apache/templates/md.conf.j2
index 850b937..66ac17b 100644
--- a/roles/apache/templates/md.conf.j2
+++ b/roles/apache/templates/md.conf.j2
@@ -29,8 +29,8 @@
 {% endif %}
         DocumentRoot /var/www/html
         AllowEncodedSlashes NoDecode
-        ProxyPass "/" "http://127.0.0.1:5002/{{ realm }}" nocanon
-        ProxyPassReverse "/" "http://127.0.0.1:5002/{{ realm }}"
+        ProxyPass "/" "http://127.0.0.1:5002/{{ realm }}/" nocanon
+        ProxyPassReverse "/" "http://127.0.0.1:5002/{{ realm }}/"
 </VirtualHost>
 {% endfor %}
 {% endif %}
-- 
GitLab