From 402b6e1c4bd46fec06240b6848f3d53fe33e7bca Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Fri, 12 May 2023 16:23:22 +0200
Subject: [PATCH] Add dns

---
 manifests/satosa.pp                           |   1 +
 .../application/mappingfile-prod.json.erb     | 108 +++++++++---------
 2 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/manifests/satosa.pp b/manifests/satosa.pp
index 9729dd1..10f6c1f 100644
--- a/manifests/satosa.pp
+++ b/manifests/satosa.pp
@@ -32,6 +32,7 @@ class sunetdrive::satosa($dehydrated_name=undef,$image='docker.sunet.se/satosa',
   sunet::docker_run {'satosa':
     image    => $image,
     imagetag => $tag,
+    dns      => ['89.32.32.32'],
     volumes  => ['/etc/satosa:/etc/satosa','/etc/dehydrated:/etc/dehydrated'],
     ports    => ['443:8000'],
     env      => ['METADATA_DIR=/etc/satosa/metadata', 'WORKER_TIMEOUT=120']
diff --git a/templates/application/mappingfile-prod.json.erb b/templates/application/mappingfile-prod.json.erb
index 2b0b4f4..4f71ad4 100644
--- a/templates/application/mappingfile-prod.json.erb
+++ b/templates/application/mappingfile-prod.json.erb
@@ -1,57 +1,57 @@
 {
-  "/antagning.se$/": "antagning.drive.sunet.se",
-  "/bth.se$/": "bth.drive.sunet.se",
-  "/chalmers.se$/": "chalmers.drive.sunet.se",
-  "/du.se$/": "du.drive.sunet.se",
-  "/eduid.se$/": "extern.drive.sunet.se",
-  "/esh.se$/": "esh.drive.sunet.se",
-  "/fhs.se$/": "fhs.drive.sunet.se",
-  "/gih.se$/": "gih.drive.sunet.se",
-  "/gu.se$/": "gu.drive.sunet.se",
-  "/hb.se$/": "hb.drive.sunet.se",
-  "/shh.se$/": "shh.drive.sunet.se",
-  "/hh.se$/": "hh.drive.sunet.se",
-  "/hhs.se$/": "hhs.drive.sunet.se",
-  "/hig.se$/": "hig.drive.sunet.se",
-  "/his.se$/": "his.drive.sunet.se",
-  "/hj.se$/": "hj.drive.sunet.se",
-  "/hkr.se$/": "hkr.drive.sunet.se",
-  "/hv.se$/": "hv.drive.sunet.se",
-  "/irf.se$/": "irf.drive.sunet.se",
-  "/kb.se$/": "kb.drive.sunet.se",
-  "/ki.se$/": "ki.drive.sunet.se",
-  "/kkh.se$/": "kkh.drive.sunet.se",
-  "/kmh.se$/": "kmh.drive.sunet.se",
-  "/konstfack.se$/": "konstfack.drive.sunet.se",
-  "/kth.se$/": "kth.drive.sunet.se",
-  "/kva.se$/": "kva.drive.sunet.se",
-  "/liu.se$/": "liu.drive.sunet.se",
-  "/lnu.se$/": "lnu.drive.sunet.se",
-  "/ltu.se$/": "ltu.drive.sunet.se",
-  "/lu.se$/": "lu.drive.sunet.se",
-  "/mah.se$/": "mau.drive.sunet.se",
-  "/mau.se$/": "mau.drive.sunet.se",
-  "/mdh.se$/": "mdu.drive.sunet.se",
-  "/mdu.se$/": "mdu.drive.sunet.se",
-  "/miun.se$/": "miun.drive.sunet.se",
-  "/nordunet.se$/": "nordunet.drive.sunet.se",
-  "/nrm.se$/": "nrm.drive.sunet.se",
-  "/oru.se$/": "oru.drive.sunet.se",
-  "/rkh.se$/": "rkh.drive.sunet.se",
-  "/sics.se$/": "sics.drive.sunet.se",
-  "/slu.se$/": "slu.drive.sunet.se",
-  "/smhi.se$/": "smhi.drive.sunet.se",
-  "/sp.se$/": "sp.drive.sunet.se",
-  "/su.se$/": "su.drive.sunet.se",
-  "/sunet.se$/": "sunet.drive.sunet.se",
-  "/suni.se$/": "suni.drive.sunet.se",
-  "/swamid.se$/": "swamid.drive.sunet.se",
-  "/ths.se$/": "ths.drive.sunet.se",
-  "/uhr.se$/": "uhr.drive.sunet.se",
-  "/umu.se$/": "umu.drive.sunet.se",
-  "/uniarts.se$/": "uniarts.drive.sunet.se",
-  "/uu.se$/": "uu.drive.sunet.se",
-  "/vinnova.se$/": "vinnova.drive.sunet.se",
-  "/vr.se$/": "vr.drive.sunet.se",
+  "/@antagning\.se$/": "antagning.drive.sunet.se",
+  "/bth\.se$/": "bth.drive.sunet.se",
+  "/chalmers\.se$/": "chalmers.drive.sunet.se",
+  "/du\.se$/": "du.drive.sunet.se",
+  "/eduid\.se$/": "extern.drive.sunet.se",
+  "/esh\.se$/": "esh.drive.sunet.se",
+  "/fhs\.se$/": "fhs.drive.sunet.se",
+  "/gih\.se$/": "gih.drive.sunet.se",
+  "/gu\.se$/": "gu.drive.sunet.se",
+  "/hb\.se$/": "hb.drive.sunet.se",
+  "/@shh\.se$/": "shh.drive.sunet.se",
+  "/hh\.se$/": "hh.drive.sunet.se",
+  "/hhs\.se$/": "hhs.drive.sunet.se",
+  "/hig\.se$/": "hig.drive.sunet.se",
+  "/his\.se$/": "his.drive.sunet.se",
+  "/hj\.se$/": "hj.drive.sunet.se",
+  "/hkr\.se$/": "hkr.drive.sunet.se",
+  "/hv\.se$/": "hv.drive.sunet.se",
+  "/irf\.se$/": "irf.drive.sunet.se",
+  "/kb\.se$/": "kb.drive.sunet.se",
+  "/ki\.se$/": "ki.drive.sunet.se",
+  "/kkh\.se$/": "kkh.drive.sunet.se",
+  "/kmh\.se$/": "kmh.drive.sunet.se",
+  "/konstfack\.se$/": "konstfack.drive.sunet.se",
+  "/kth\.se$/": "kth.drive.sunet.se",
+  "/kva\.se$/": "kva.drive.sunet.se",
+  "/liu\.se$/": "liu.drive.sunet.se",
+  "/lnu\.se$/": "lnu.drive.sunet.se",
+  "/ltu\.se$/": "ltu.drive.sunet.se",
+  "/lu\.se$/": "lu.drive.sunet.se",
+  "/mah\.se$/": "mau.drive.sunet.se",
+  "/mau\.se$/": "mau.drive.sunet.se",
+  "/mdh\.se$/": "mdu.drive.sunet.se",
+  "/mdu\.se$/": "mdu.drive.sunet.se",
+  "/miun\.se$/": "miun.drive.sunet.se",
+  "/nordunet\.se$/": "nordunet.drive.sunet.se",
+  "/nrm\.se$/": "nrm.drive.sunet.se",
+  "/oru\.se$/": "oru.drive.sunet.se",
+  "/rkh\.se$/": "rkh.drive.sunet.se",
+  "/sics\.se$/": "sics.drive.sunet.se",
+  "/slu\.se$/": "slu.drive.sunet.se",
+  "/smhi\.se$/": "smhi.drive.sunet.se",
+  "/sp\.se$/": "sp.drive.sunet.se",
+  "/su\.se$/": "su.drive.sunet.se",
+  "/sunet\.se$/": "sunet.drive.sunet.se",
+  "/suni\.se$/": "suni.drive.sunet.se",
+  "/swamid\.se$/": "swamid.drive.sunet.se",
+  "/ths\.se$/": "ths.drive.sunet.se",
+  "/uhr\.se$/": "uhr.drive.sunet.se",
+  "/umu\.se$/": "umu.drive.sunet.se",
+  "/uniarts\.se$/": "uniarts.drive.sunet.se",
+  "/uu\.se$/": "uu.drive.sunet.se",
+  "/vinnova\.se$/": "vinnova.drive.sunet.se",
+  "/vr\.se$/": "vr.drive.sunet.se",
   "/$/": "extern.drive.sunet.se"
 }