From 6211f3aaea698e87dbd17f04529f6eceb0037105 Mon Sep 17 00:00:00 2001 From: Magnus Andersson Date: Tue, 17 Oct 2023 13:16:31 +0200 Subject: [PATCH 1/9] Add fuse3 package to script serever.Dependecy to rclone mount. --- manifests/script.pp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifests/script.pp b/manifests/script.pp index c61d3bb..9229c96 100644 --- a/manifests/script.pp +++ b/manifests/script.pp @@ -68,6 +68,10 @@ class sunetdrive::script ( source => $local_path, require => Exec['rclone_deb'], } + package { 'fuse3': + ensure => installed, + provider => apt, + } package { 'python3.9': ensure => installed, provider => apt, From ec9115df06cf21dd0d84d27ed4780cf68f613134 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Tue, 17 Oct 2023 10:25:33 +0200 Subject: [PATCH 2/9] Nextcloud: Implement logs to stdout --- templates/application/docker-compose_nextcloud.yml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/application/docker-compose_nextcloud.yml.erb b/templates/application/docker-compose_nextcloud.yml.erb index e6d4468..7e34396 100644 --- a/templates/application/docker-compose_nextcloud.yml.erb +++ b/templates/application/docker-compose_nextcloud.yml.erb @@ -36,7 +36,7 @@ services: - 89.32.32.32 ports: - 443:443 - command: apachectl -D FOREGROUND + command: sh -c 'tail -f /var/www/html/data/nextcloud.log | tee -a /proc/1/fd/2 & apachectl -D FOREGROUND' tty: true networks: From bdd858f76c32967848cddbcf8e94abcc890874b7 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Wed, 18 Oct 2023 09:46:14 +0200 Subject: [PATCH 3/9] Allow imap servers to connect --- manifests/db_type.pp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifests/db_type.pp b/manifests/db_type.pp index a6a9327..1f9a9c8 100644 --- a/manifests/db_type.pp +++ b/manifests/db_type.pp @@ -33,6 +33,8 @@ define sunetdrive::db_type( $ports = [3306, 4444, 4567, 4568] if $location =~ /^multinode/ { $from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 + $config['kube'] + $config['kube_v6'] + } elsif $location == 'sunet-test' { + $from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 + $config['imap'] + $config['imap_v6'] } else { $from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 } From eb0bb65f4a43cb925e8ffa66da6573fe44730efd Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Wed, 18 Oct 2023 18:06:11 +0200 Subject: [PATCH 4/9] Allow smtp servers --- manifests/db_type.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/db_type.pp b/manifests/db_type.pp index 1f9a9c8..72cb1f2 100644 --- a/manifests/db_type.pp +++ b/manifests/db_type.pp @@ -34,7 +34,7 @@ define sunetdrive::db_type( if $location =~ /^multinode/ { $from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 + $config['kube'] + $config['kube_v6'] } elsif $location == 'sunet-test' { - $from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 + $config['imap'] + $config['imap_v6'] + $from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 + $config['imap'] + $config['imap_v6'] + $config['smtp'] + $config['smtp_v6'] } else { $from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6 } From 21d9a5e3d06cf4aa2edd8f81eafccb67f1376bbd Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Thu, 19 Oct 2023 14:49:46 +0200 Subject: [PATCH 5/9] Remove test --- .../application/mappingfile-prod.json.erb | 112 +++++++++--------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/templates/application/mappingfile-prod.json.erb b/templates/application/mappingfile-prod.json.erb index 18f0553..958b4ab 100644 --- a/templates/application/mappingfile-prod.json.erb +++ b/templates/application/mappingfile-prod.json.erb @@ -1,58 +1,58 @@ { - "/@(\\w+\\.)*antagning.se$/": "antagning.drive.test.sunet.se", - "/@(\\w+\\.)*bth.se$/": "bth.drive.test.sunet.se", - "/@(\\w+\\.)*chalmers.se$/": "chalmers.drive.test.sunet.se", - "/@(\\w+\\.)*du.se$/": "du.drive.test.sunet.se", - "/@(\\w+\\.)*eduid.se$/": "extern.drive.test.sunet.se", - "/@(\\w+\\.)*esh.se$/": "esh.drive.test.sunet.se", - "/@(\\w+\\.)*fhs.se$/": "fhs.drive.test.sunet.se", - "/@(\\w+\\.)*gih.se$/": "gih.drive.test.sunet.se", - "/@(\\w+\\.)*gu.se$/": "gu.drive.test.sunet.se", - "/@(\\w+\\.)*hb.se$/": "hb.drive.test.sunet.se", - "/@(\\w+\\.)*shh.se$/": "shh.drive.test.sunet.se", - "/@(\\w+\\.)*hh.se$/": "hh.drive.test.sunet.se", - "/@(\\w+\\.)*hhs.se$/": "hhs.drive.test.sunet.se", - "/@(\\w+\\.)*hig.se$/": "hig.drive.test.sunet.se", - "/@(\\w+\\.)*his.se$/": "his.drive.test.sunet.se", - "/@(\\w+\\.)*hj.se$/": "hj.drive.test.sunet.se", - "/@(\\w+\\.)*hkr.se$/": "hkr.drive.test.sunet.se", - "/@(\\w+\\.)*hv.se$/": "hv.drive.test.sunet.se", - "/@(\\w+\\.)*irf.se$/": "irf.drive.test.sunet.se", - "/@(\\w+\\.)*kb.se$/": "kb.drive.test.sunet.se", - "/@(\\w+\\.)*ki.se$/": "ki.drive.test.sunet.se", - "/@(\\w+\\.)*kkh.se$/": "kkh.drive.test.sunet.se", - "/@(\\w+\\.)*kmh.se$/": "kmh.drive.test.sunet.se", - "/@(\\w+\\.)*konstfack.se$/": "konstfack.drive.test.sunet.se", - "/@(\\w+\\.)*kth.se$/": "kth.drive.test.sunet.se", - "/@(\\w+\\.)*kva.se$/": "kva.drive.test.sunet.se", - "/@(\\w+\\.)*liu.se$/": "liu.drive.test.sunet.se", - "/@(\\w+\\.)*lnu.se$/": "lnu.drive.test.sunet.se", - "/@(\\w+\\.)*ltu.se$/": "ltu.drive.test.sunet.se", - "/@(\\w+\\.)*lu.se$/": "lu.drive.test.sunet.se", - "/@(\\w+\\.)*mah.se$/": "mau.drive.test.sunet.se", - "/@(\\w+\\.)*mau.se$/": "mau.drive.test.sunet.se", - "/@(\\w+\\.)*mdh.se$/": "mdu.drive.test.sunet.se", - "/@(\\w+\\.)*mdu.se$/": "mdu.drive.test.sunet.se", - "/@(\\w+\\.)*miun.se$/": "miun.drive.test.sunet.se", - "/@(\\w+\\.)*nordunet.se$/": "nordunet.drive.test.sunet.se", - "/@(\\w+\\.)*nordu.net$/": "nordunet.drive.test.sunet.se", - "/@(\\w+\\.)*nrm.se$/": "nrm.drive.test.sunet.se", - "/@(\\w+\\.)*oru.se$/": "oru.drive.test.sunet.se", - "/@(\\w+\\.)*rkh.se$/": "rkh.drive.test.sunet.se", - "/@(\\w+\\.)*sics.se$/": "sics.drive.test.sunet.se", - "/@(\\w+\\.)*slu.se$/": "slu.drive.test.sunet.se", - "/@(\\w+\\.)*smhi.se$/": "smhi.drive.test.sunet.se", - "/@(\\w+\\.)*sp.se$/": "sp.drive.test.sunet.se", - "/@(\\w+\\.)*su.se$/": "su.drive.test.sunet.se", - "/@(\\w+\\.)*sunet.se$/": "sunet.drive.test.sunet.se", - "/@(\\w+\\.)*suni.se$/": "suni.drive.test.sunet.se", - "/@(\\w+\\.)*swamid.se$/": "swamid.drive.test.sunet.se", - "/@(\\w+\\.)*ths.se$/": "ths.drive.test.sunet.se", - "/@(\\w+\\.)*uhr.se$/": "uhr.drive.test.sunet.se", - "/@(\\w+\\.)*umu.se$/": "umu.drive.test.sunet.se", - "/@(\\w+\\.)*uniarts.se$/": "uniarts.drive.test.sunet.se", - "/@(\\w+\\.)*uu.se$/": "uu.drive.test.sunet.se", - "/@(\\w+\\.)*vinnova.se$/": "vinnova.drive.test.sunet.se", - "/@(\\w+\\.)*vr.se$/": "vr.drive.test.sunet.se", - "/$/": "extern.drive.test.sunet.se" + "/@(\\w+\\.)*antagning.se$/": "antagning.drive.sunet.se", + "/@(\\w+\\.)*bth.se$/": "bth.drive.sunet.se", + "/@(\\w+\\.)*chalmers.se$/": "chalmers.drive.sunet.se", + "/@(\\w+\\.)*du.se$/": "du.drive.sunet.se", + "/@(\\w+\\.)*eduid.se$/": "extern.drive.sunet.se", + "/@(\\w+\\.)*esh.se$/": "esh.drive.sunet.se", + "/@(\\w+\\.)*fhs.se$/": "fhs.drive.sunet.se", + "/@(\\w+\\.)*gih.se$/": "gih.drive.sunet.se", + "/@(\\w+\\.)*gu.se$/": "gu.drive.sunet.se", + "/@(\\w+\\.)*hb.se$/": "hb.drive.sunet.se", + "/@(\\w+\\.)*shh.se$/": "shh.drive.sunet.se", + "/@(\\w+\\.)*hh.se$/": "hh.drive.sunet.se", + "/@(\\w+\\.)*hhs.se$/": "hhs.drive.sunet.se", + "/@(\\w+\\.)*hig.se$/": "hig.drive.sunet.se", + "/@(\\w+\\.)*his.se$/": "his.drive.sunet.se", + "/@(\\w+\\.)*hj.se$/": "hj.drive.sunet.se", + "/@(\\w+\\.)*hkr.se$/": "hkr.drive.sunet.se", + "/@(\\w+\\.)*hv.se$/": "hv.drive.sunet.se", + "/@(\\w+\\.)*irf.se$/": "irf.drive.sunet.se", + "/@(\\w+\\.)*kb.se$/": "kb.drive.sunet.se", + "/@(\\w+\\.)*ki.se$/": "ki.drive.sunet.se", + "/@(\\w+\\.)*kkh.se$/": "kkh.drive.sunet.se", + "/@(\\w+\\.)*kmh.se$/": "kmh.drive.sunet.se", + "/@(\\w+\\.)*konstfack.se$/": "konstfack.drive.sunet.se", + "/@(\\w+\\.)*kth.se$/": "kth.drive.sunet.se", + "/@(\\w+\\.)*kva.se$/": "kva.drive.sunet.se", + "/@(\\w+\\.)*liu.se$/": "liu.drive.sunet.se", + "/@(\\w+\\.)*lnu.se$/": "lnu.drive.sunet.se", + "/@(\\w+\\.)*ltu.se$/": "ltu.drive.sunet.se", + "/@(\\w+\\.)*lu.se$/": "lu.drive.sunet.se", + "/@(\\w+\\.)*mah.se$/": "mau.drive.sunet.se", + "/@(\\w+\\.)*mau.se$/": "mau.drive.sunet.se", + "/@(\\w+\\.)*mdh.se$/": "mdu.drive.sunet.se", + "/@(\\w+\\.)*mdu.se$/": "mdu.drive.sunet.se", + "/@(\\w+\\.)*miun.se$/": "miun.drive.sunet.se", + "/@(\\w+\\.)*nordunet.se$/": "nordunet.drive.sunet.se", + "/@(\\w+\\.)*nordu.net$/": "nordunet.drive.sunet.se", + "/@(\\w+\\.)*nrm.se$/": "nrm.drive.sunet.se", + "/@(\\w+\\.)*oru.se$/": "oru.drive.sunet.se", + "/@(\\w+\\.)*rkh.se$/": "rkh.drive.sunet.se", + "/@(\\w+\\.)*sics.se$/": "sics.drive.sunet.se", + "/@(\\w+\\.)*slu.se$/": "slu.drive.sunet.se", + "/@(\\w+\\.)*smhi.se$/": "smhi.drive.sunet.se", + "/@(\\w+\\.)*sp.se$/": "sp.drive.sunet.se", + "/@(\\w+\\.)*su.se$/": "su.drive.sunet.se", + "/@(\\w+\\.)*sunet.se$/": "sunet.drive.sunet.se", + "/@(\\w+\\.)*suni.se$/": "suni.drive.sunet.se", + "/@(\\w+\\.)*swamid.se$/": "swamid.drive.sunet.se", + "/@(\\w+\\.)*ths.se$/": "ths.drive.sunet.se", + "/@(\\w+\\.)*uhr.se$/": "uhr.drive.sunet.se", + "/@(\\w+\\.)*umu.se$/": "umu.drive.sunet.se", + "/@(\\w+\\.)*uniarts.se$/": "uniarts.drive.sunet.se", + "/@(\\w+\\.)*uu.se$/": "uu.drive.sunet.se", + "/@(\\w+\\.)*vinnova.se$/": "vinnova.drive.sunet.se", + "/@(\\w+\\.)*vr.se$/": "vr.drive.sunet.se", + "/$/": "extern.drive.sunet.se" } From e06a29a8a153556256dc13d2588ebcf9bd89f0ee Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Mon, 23 Oct 2023 12:35:24 +0200 Subject: [PATCH 6/9] Revert mapping file for prod --- .../application/mappingfile-prod.json.erb | 110 +++++++++--------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/templates/application/mappingfile-prod.json.erb b/templates/application/mappingfile-prod.json.erb index 958b4ab..b188884 100644 --- a/templates/application/mappingfile-prod.json.erb +++ b/templates/application/mappingfile-prod.json.erb @@ -1,58 +1,58 @@ { - "/@(\\w+\\.)*antagning.se$/": "antagning.drive.sunet.se", - "/@(\\w+\\.)*bth.se$/": "bth.drive.sunet.se", - "/@(\\w+\\.)*chalmers.se$/": "chalmers.drive.sunet.se", - "/@(\\w+\\.)*du.se$/": "du.drive.sunet.se", - "/@(\\w+\\.)*eduid.se$/": "extern.drive.sunet.se", - "/@(\\w+\\.)*esh.se$/": "esh.drive.sunet.se", - "/@(\\w+\\.)*fhs.se$/": "fhs.drive.sunet.se", - "/@(\\w+\\.)*gih.se$/": "gih.drive.sunet.se", - "/@(\\w+\\.)*gu.se$/": "gu.drive.sunet.se", - "/@(\\w+\\.)*hb.se$/": "hb.drive.sunet.se", - "/@(\\w+\\.)*shh.se$/": "shh.drive.sunet.se", - "/@(\\w+\\.)*hh.se$/": "hh.drive.sunet.se", - "/@(\\w+\\.)*hhs.se$/": "hhs.drive.sunet.se", - "/@(\\w+\\.)*hig.se$/": "hig.drive.sunet.se", - "/@(\\w+\\.)*his.se$/": "his.drive.sunet.se", - "/@(\\w+\\.)*hj.se$/": "hj.drive.sunet.se", - "/@(\\w+\\.)*hkr.se$/": "hkr.drive.sunet.se", - "/@(\\w+\\.)*hv.se$/": "hv.drive.sunet.se", - "/@(\\w+\\.)*irf.se$/": "irf.drive.sunet.se", - "/@(\\w+\\.)*kb.se$/": "kb.drive.sunet.se", - "/@(\\w+\\.)*ki.se$/": "ki.drive.sunet.se", - "/@(\\w+\\.)*kkh.se$/": "kkh.drive.sunet.se", - "/@(\\w+\\.)*kmh.se$/": "kmh.drive.sunet.se", - "/@(\\w+\\.)*konstfack.se$/": "konstfack.drive.sunet.se", - "/@(\\w+\\.)*kth.se$/": "kth.drive.sunet.se", - "/@(\\w+\\.)*kva.se$/": "kva.drive.sunet.se", - "/@(\\w+\\.)*liu.se$/": "liu.drive.sunet.se", - "/@(\\w+\\.)*lnu.se$/": "lnu.drive.sunet.se", - "/@(\\w+\\.)*ltu.se$/": "ltu.drive.sunet.se", - "/@(\\w+\\.)*lu.se$/": "lu.drive.sunet.se", - "/@(\\w+\\.)*mah.se$/": "mau.drive.sunet.se", - "/@(\\w+\\.)*mau.se$/": "mau.drive.sunet.se", - "/@(\\w+\\.)*mdh.se$/": "mdu.drive.sunet.se", - "/@(\\w+\\.)*mdu.se$/": "mdu.drive.sunet.se", - "/@(\\w+\\.)*miun.se$/": "miun.drive.sunet.se", - "/@(\\w+\\.)*nordunet.se$/": "nordunet.drive.sunet.se", - "/@(\\w+\\.)*nordu.net$/": "nordunet.drive.sunet.se", - "/@(\\w+\\.)*nrm.se$/": "nrm.drive.sunet.se", - "/@(\\w+\\.)*oru.se$/": "oru.drive.sunet.se", - "/@(\\w+\\.)*rkh.se$/": "rkh.drive.sunet.se", - "/@(\\w+\\.)*sics.se$/": "sics.drive.sunet.se", - "/@(\\w+\\.)*slu.se$/": "slu.drive.sunet.se", - "/@(\\w+\\.)*smhi.se$/": "smhi.drive.sunet.se", - "/@(\\w+\\.)*sp.se$/": "sp.drive.sunet.se", - "/@(\\w+\\.)*su.se$/": "su.drive.sunet.se", - "/@(\\w+\\.)*sunet.se$/": "sunet.drive.sunet.se", - "/@(\\w+\\.)*suni.se$/": "suni.drive.sunet.se", - "/@(\\w+\\.)*swamid.se$/": "swamid.drive.sunet.se", - "/@(\\w+\\.)*ths.se$/": "ths.drive.sunet.se", - "/@(\\w+\\.)*uhr.se$/": "uhr.drive.sunet.se", - "/@(\\w+\\.)*umu.se$/": "umu.drive.sunet.se", - "/@(\\w+\\.)*uniarts.se$/": "uniarts.drive.sunet.se", - "/@(\\w+\\.)*uu.se$/": "uu.drive.sunet.se", - "/@(\\w+\\.)*vinnova.se$/": "vinnova.drive.sunet.se", - "/@(\\w+\\.)*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", + "/nordu.net$/": "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" } From 14b6535efd63d5412aab64730f300f209c09ec4d Mon Sep 17 00:00:00 2001 From: Magnus Andersson Date: Mon, 23 Oct 2023 14:49:46 +0200 Subject: [PATCH 7/9] Test of adding 4 backslashes in mappingfile-test.json.erb to deal with json handling of backslashes. --- .../application/mappingfile-test.json.erb | 110 +++++++++--------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/templates/application/mappingfile-test.json.erb b/templates/application/mappingfile-test.json.erb index 18f0553..67f1850 100644 --- a/templates/application/mappingfile-test.json.erb +++ b/templates/application/mappingfile-test.json.erb @@ -1,58 +1,58 @@ { - "/@(\\w+\\.)*antagning.se$/": "antagning.drive.test.sunet.se", - "/@(\\w+\\.)*bth.se$/": "bth.drive.test.sunet.se", - "/@(\\w+\\.)*chalmers.se$/": "chalmers.drive.test.sunet.se", - "/@(\\w+\\.)*du.se$/": "du.drive.test.sunet.se", - "/@(\\w+\\.)*eduid.se$/": "extern.drive.test.sunet.se", - "/@(\\w+\\.)*esh.se$/": "esh.drive.test.sunet.se", - "/@(\\w+\\.)*fhs.se$/": "fhs.drive.test.sunet.se", - "/@(\\w+\\.)*gih.se$/": "gih.drive.test.sunet.se", - "/@(\\w+\\.)*gu.se$/": "gu.drive.test.sunet.se", - "/@(\\w+\\.)*hb.se$/": "hb.drive.test.sunet.se", - "/@(\\w+\\.)*shh.se$/": "shh.drive.test.sunet.se", - "/@(\\w+\\.)*hh.se$/": "hh.drive.test.sunet.se", - "/@(\\w+\\.)*hhs.se$/": "hhs.drive.test.sunet.se", - "/@(\\w+\\.)*hig.se$/": "hig.drive.test.sunet.se", - "/@(\\w+\\.)*his.se$/": "his.drive.test.sunet.se", - "/@(\\w+\\.)*hj.se$/": "hj.drive.test.sunet.se", - "/@(\\w+\\.)*hkr.se$/": "hkr.drive.test.sunet.se", - "/@(\\w+\\.)*hv.se$/": "hv.drive.test.sunet.se", - "/@(\\w+\\.)*irf.se$/": "irf.drive.test.sunet.se", - "/@(\\w+\\.)*kb.se$/": "kb.drive.test.sunet.se", - "/@(\\w+\\.)*ki.se$/": "ki.drive.test.sunet.se", - "/@(\\w+\\.)*kkh.se$/": "kkh.drive.test.sunet.se", - "/@(\\w+\\.)*kmh.se$/": "kmh.drive.test.sunet.se", - "/@(\\w+\\.)*konstfack.se$/": "konstfack.drive.test.sunet.se", - "/@(\\w+\\.)*kth.se$/": "kth.drive.test.sunet.se", - "/@(\\w+\\.)*kva.se$/": "kva.drive.test.sunet.se", - "/@(\\w+\\.)*liu.se$/": "liu.drive.test.sunet.se", - "/@(\\w+\\.)*lnu.se$/": "lnu.drive.test.sunet.se", - "/@(\\w+\\.)*ltu.se$/": "ltu.drive.test.sunet.se", - "/@(\\w+\\.)*lu.se$/": "lu.drive.test.sunet.se", - "/@(\\w+\\.)*mah.se$/": "mau.drive.test.sunet.se", - "/@(\\w+\\.)*mau.se$/": "mau.drive.test.sunet.se", - "/@(\\w+\\.)*mdh.se$/": "mdu.drive.test.sunet.se", - "/@(\\w+\\.)*mdu.se$/": "mdu.drive.test.sunet.se", - "/@(\\w+\\.)*miun.se$/": "miun.drive.test.sunet.se", - "/@(\\w+\\.)*nordunet.se$/": "nordunet.drive.test.sunet.se", - "/@(\\w+\\.)*nordu.net$/": "nordunet.drive.test.sunet.se", - "/@(\\w+\\.)*nrm.se$/": "nrm.drive.test.sunet.se", - "/@(\\w+\\.)*oru.se$/": "oru.drive.test.sunet.se", - "/@(\\w+\\.)*rkh.se$/": "rkh.drive.test.sunet.se", - "/@(\\w+\\.)*sics.se$/": "sics.drive.test.sunet.se", - "/@(\\w+\\.)*slu.se$/": "slu.drive.test.sunet.se", - "/@(\\w+\\.)*smhi.se$/": "smhi.drive.test.sunet.se", - "/@(\\w+\\.)*sp.se$/": "sp.drive.test.sunet.se", - "/@(\\w+\\.)*su.se$/": "su.drive.test.sunet.se", - "/@(\\w+\\.)*sunet.se$/": "sunet.drive.test.sunet.se", - "/@(\\w+\\.)*suni.se$/": "suni.drive.test.sunet.se", - "/@(\\w+\\.)*swamid.se$/": "swamid.drive.test.sunet.se", - "/@(\\w+\\.)*ths.se$/": "ths.drive.test.sunet.se", - "/@(\\w+\\.)*uhr.se$/": "uhr.drive.test.sunet.se", - "/@(\\w+\\.)*umu.se$/": "umu.drive.test.sunet.se", - "/@(\\w+\\.)*uniarts.se$/": "uniarts.drive.test.sunet.se", - "/@(\\w+\\.)*uu.se$/": "uu.drive.test.sunet.se", - "/@(\\w+\\.)*vinnova.se$/": "vinnova.drive.test.sunet.se", - "/@(\\w+\\.)*vr.se$/": "vr.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*antagning.se$/": "antagning.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*bth.se$/": "bth.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*chalmers.se$/": "chalmers.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*du.se$/": "du.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*eduid.se$/": "extern.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*esh.se$/": "esh.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*fhs.se$/": "fhs.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*gih.se$/": "gih.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*gu.se$/": "gu.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*hb.se$/": "hb.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*shh.se$/": "shh.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*hh.se$/": "hh.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*hhs.se$/": "hhs.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*hig.se$/": "hig.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*his.se$/": "his.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*hj.se$/": "hj.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*hkr.se$/": "hkr.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*hv.se$/": "hv.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*irf.se$/": "irf.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*kb.se$/": "kb.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*ki.se$/": "ki.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*kkh.se$/": "kkh.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*kmh.se$/": "kmh.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*konstfack.se$/": "konstfack.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*kth.se$/": "kth.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*kva.se$/": "kva.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*liu.se$/": "liu.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*lnu.se$/": "lnu.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*ltu.se$/": "ltu.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*lu.se$/": "lu.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*mah.se$/": "mau.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*mau.se$/": "mau.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*mdh.se$/": "mdu.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*mdu.se$/": "mdu.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*miun.se$/": "miun.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*nordunet.se$/": "nordunet.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*nordu.net$/": "nordunet.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*nrm.se$/": "nrm.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*oru.se$/": "oru.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*rkh.se$/": "rkh.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*sics.se$/": "sics.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*slu.se$/": "slu.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*smhi.se$/": "smhi.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*sp.se$/": "sp.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*su.se$/": "su.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*sunet.se$/": "sunet.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*suni.se$/": "suni.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*swamid.se$/": "swamid.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*ths.se$/": "ths.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*uhr.se$/": "uhr.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*umu.se$/": "umu.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*uniarts.se$/": "uniarts.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*uu.se$/": "uu.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*vinnova.se$/": "vinnova.drive.test.sunet.se", + "/@(\\\\w+\\\\.)*vr.se$/": "vr.drive.test.sunet.se", "/$/": "extern.drive.test.sunet.se" } From 3cdf7d40844007c444a67db3d00046dea2662874 Mon Sep 17 00:00:00 2001 From: Magnus Andersson Date: Mon, 23 Oct 2023 15:13:11 +0200 Subject: [PATCH 8/9] Revert "4 backslashes in mappingfile-test.json.erb. Does not work." This reverts commit 14b6535efd63d5412aab64730f300f209c09ec4d. --- .../application/mappingfile-test.json.erb | 110 +++++++++--------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/templates/application/mappingfile-test.json.erb b/templates/application/mappingfile-test.json.erb index 67f1850..18f0553 100644 --- a/templates/application/mappingfile-test.json.erb +++ b/templates/application/mappingfile-test.json.erb @@ -1,58 +1,58 @@ { - "/@(\\\\w+\\\\.)*antagning.se$/": "antagning.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*bth.se$/": "bth.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*chalmers.se$/": "chalmers.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*du.se$/": "du.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*eduid.se$/": "extern.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*esh.se$/": "esh.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*fhs.se$/": "fhs.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*gih.se$/": "gih.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*gu.se$/": "gu.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*hb.se$/": "hb.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*shh.se$/": "shh.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*hh.se$/": "hh.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*hhs.se$/": "hhs.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*hig.se$/": "hig.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*his.se$/": "his.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*hj.se$/": "hj.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*hkr.se$/": "hkr.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*hv.se$/": "hv.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*irf.se$/": "irf.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*kb.se$/": "kb.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*ki.se$/": "ki.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*kkh.se$/": "kkh.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*kmh.se$/": "kmh.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*konstfack.se$/": "konstfack.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*kth.se$/": "kth.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*kva.se$/": "kva.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*liu.se$/": "liu.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*lnu.se$/": "lnu.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*ltu.se$/": "ltu.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*lu.se$/": "lu.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*mah.se$/": "mau.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*mau.se$/": "mau.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*mdh.se$/": "mdu.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*mdu.se$/": "mdu.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*miun.se$/": "miun.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*nordunet.se$/": "nordunet.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*nordu.net$/": "nordunet.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*nrm.se$/": "nrm.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*oru.se$/": "oru.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*rkh.se$/": "rkh.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*sics.se$/": "sics.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*slu.se$/": "slu.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*smhi.se$/": "smhi.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*sp.se$/": "sp.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*su.se$/": "su.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*sunet.se$/": "sunet.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*suni.se$/": "suni.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*swamid.se$/": "swamid.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*ths.se$/": "ths.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*uhr.se$/": "uhr.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*umu.se$/": "umu.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*uniarts.se$/": "uniarts.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*uu.se$/": "uu.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*vinnova.se$/": "vinnova.drive.test.sunet.se", - "/@(\\\\w+\\\\.)*vr.se$/": "vr.drive.test.sunet.se", + "/@(\\w+\\.)*antagning.se$/": "antagning.drive.test.sunet.se", + "/@(\\w+\\.)*bth.se$/": "bth.drive.test.sunet.se", + "/@(\\w+\\.)*chalmers.se$/": "chalmers.drive.test.sunet.se", + "/@(\\w+\\.)*du.se$/": "du.drive.test.sunet.se", + "/@(\\w+\\.)*eduid.se$/": "extern.drive.test.sunet.se", + "/@(\\w+\\.)*esh.se$/": "esh.drive.test.sunet.se", + "/@(\\w+\\.)*fhs.se$/": "fhs.drive.test.sunet.se", + "/@(\\w+\\.)*gih.se$/": "gih.drive.test.sunet.se", + "/@(\\w+\\.)*gu.se$/": "gu.drive.test.sunet.se", + "/@(\\w+\\.)*hb.se$/": "hb.drive.test.sunet.se", + "/@(\\w+\\.)*shh.se$/": "shh.drive.test.sunet.se", + "/@(\\w+\\.)*hh.se$/": "hh.drive.test.sunet.se", + "/@(\\w+\\.)*hhs.se$/": "hhs.drive.test.sunet.se", + "/@(\\w+\\.)*hig.se$/": "hig.drive.test.sunet.se", + "/@(\\w+\\.)*his.se$/": "his.drive.test.sunet.se", + "/@(\\w+\\.)*hj.se$/": "hj.drive.test.sunet.se", + "/@(\\w+\\.)*hkr.se$/": "hkr.drive.test.sunet.se", + "/@(\\w+\\.)*hv.se$/": "hv.drive.test.sunet.se", + "/@(\\w+\\.)*irf.se$/": "irf.drive.test.sunet.se", + "/@(\\w+\\.)*kb.se$/": "kb.drive.test.sunet.se", + "/@(\\w+\\.)*ki.se$/": "ki.drive.test.sunet.se", + "/@(\\w+\\.)*kkh.se$/": "kkh.drive.test.sunet.se", + "/@(\\w+\\.)*kmh.se$/": "kmh.drive.test.sunet.se", + "/@(\\w+\\.)*konstfack.se$/": "konstfack.drive.test.sunet.se", + "/@(\\w+\\.)*kth.se$/": "kth.drive.test.sunet.se", + "/@(\\w+\\.)*kva.se$/": "kva.drive.test.sunet.se", + "/@(\\w+\\.)*liu.se$/": "liu.drive.test.sunet.se", + "/@(\\w+\\.)*lnu.se$/": "lnu.drive.test.sunet.se", + "/@(\\w+\\.)*ltu.se$/": "ltu.drive.test.sunet.se", + "/@(\\w+\\.)*lu.se$/": "lu.drive.test.sunet.se", + "/@(\\w+\\.)*mah.se$/": "mau.drive.test.sunet.se", + "/@(\\w+\\.)*mau.se$/": "mau.drive.test.sunet.se", + "/@(\\w+\\.)*mdh.se$/": "mdu.drive.test.sunet.se", + "/@(\\w+\\.)*mdu.se$/": "mdu.drive.test.sunet.se", + "/@(\\w+\\.)*miun.se$/": "miun.drive.test.sunet.se", + "/@(\\w+\\.)*nordunet.se$/": "nordunet.drive.test.sunet.se", + "/@(\\w+\\.)*nordu.net$/": "nordunet.drive.test.sunet.se", + "/@(\\w+\\.)*nrm.se$/": "nrm.drive.test.sunet.se", + "/@(\\w+\\.)*oru.se$/": "oru.drive.test.sunet.se", + "/@(\\w+\\.)*rkh.se$/": "rkh.drive.test.sunet.se", + "/@(\\w+\\.)*sics.se$/": "sics.drive.test.sunet.se", + "/@(\\w+\\.)*slu.se$/": "slu.drive.test.sunet.se", + "/@(\\w+\\.)*smhi.se$/": "smhi.drive.test.sunet.se", + "/@(\\w+\\.)*sp.se$/": "sp.drive.test.sunet.se", + "/@(\\w+\\.)*su.se$/": "su.drive.test.sunet.se", + "/@(\\w+\\.)*sunet.se$/": "sunet.drive.test.sunet.se", + "/@(\\w+\\.)*suni.se$/": "suni.drive.test.sunet.se", + "/@(\\w+\\.)*swamid.se$/": "swamid.drive.test.sunet.se", + "/@(\\w+\\.)*ths.se$/": "ths.drive.test.sunet.se", + "/@(\\w+\\.)*uhr.se$/": "uhr.drive.test.sunet.se", + "/@(\\w+\\.)*umu.se$/": "umu.drive.test.sunet.se", + "/@(\\w+\\.)*uniarts.se$/": "uniarts.drive.test.sunet.se", + "/@(\\w+\\.)*uu.se$/": "uu.drive.test.sunet.se", + "/@(\\w+\\.)*vinnova.se$/": "vinnova.drive.test.sunet.se", + "/@(\\w+\\.)*vr.se$/": "vr.drive.test.sunet.se", "/$/": "extern.drive.test.sunet.se" } From 3491a1a5f7156841bca07bc5917857cec924b364 Mon Sep 17 00:00:00 2001 From: Fredrik Kjellman Date: Tue, 31 Oct 2023 13:49:37 +0100 Subject: [PATCH 9/9] change MDU readme document. SD-285. --- templates/application/MDU-README.md.erb | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/templates/application/MDU-README.md.erb b/templates/application/MDU-README.md.erb index 365bfdf..997feb3 100644 --- a/templates/application/MDU-README.md.erb +++ b/templates/application/MDU-README.md.erb @@ -1,13 +1,5 @@ -Hello and welcome to your personal space for research data storage, - -It is important that research data is managed in a secure and careful manner, so that it is protected from damage and destruction. Mälardalen University offers its researchers and doctoral students a secure and stable IT service that makes it possible to store research data. Furthermore, it enables research collaboration internally and externally since researchers can easily share their data within the project or with other individual researchers at MDU in a secure way. This technical infrastructure entails a good collaboration space for researchers, a secure handling of data, the possibility for the researcher to be able to store data in such a way that data management according to the FAIR principles can be complied with at MDU. - -To meet the general need for research data storage, MDU has purchased Sunet Drive's S3 research data storage service.  Each researcher will be offered a space of 200GB per person. To simplify administration, all spaces will be appropriated in advance in the same way, regardless of the research domain or total amount of research data. - -200 GB will not correspond to all of MDU researchers' data storage needs; therefore, the researcher will have the possibility to purchase additional data space via a digital form. The additional purchase function is done by internal billing and the purchased space is then visible at the next login in the researcher's personal space.    - -If there is a need for a specific project space for research data storage and/or sharing, this is also possible. Such a space is created by an administrator after ordering project space through the same form as when purchasing additional storage space.  The project space will then be visible to project members in the personal storage space at the next login. - -Can a MDU student be included in the research project? It is possible to assign a student a time-limited access/sharing opportunity to specific folders in either the project space or the researcher's personal space. Contact the Data Access Unit (DAU) to enable such a feature. - -If you have any questions about the storage space, please contact dau@mdu.se. +Welcome to your personal space for research data storage! +Researchers and PhD-students at MDU have access to a free storage space of 200 GB. Your storage space is in the “Your storage space” folder that appears a few minutes after opening SUNET Drive for the first time. +The “Your storage space” folder has an ABG structure which means that there are folders for Arbetsmaterial (work material), Bevarande (retention) and Gallringsbart (disposable). It is possible to create subfolders within these main folders themselves. +All research data, except for military material and security-classified information, can be stored on SUNET Drive. If your data needs to undergo an export control, please refer to the check list on the internal portal. +A user guide and a FAQ regarding SUNET Drive is available on the internal portal. If you have any questions, please contact dau@mdu.se