Merge in changes from stable

This reverts commit 14b6535efd.

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'] + $config['smtp'] + $config['smtp_v6']
   } else {
     $from = $db_ip + $nextcloud_ip + $backup_ip + $backup_ipv6 + $db_ipv6
   }

manifests/script.pp

@@ -72,7 +72,7 @@ class sunetdrive::script (
     ensure   => installed,
     provider => apt,
   }
-  package { 'python3.9':
+  package { 'python3':
     ensure   => installed,
     provider => apt,
   }
@@ -81,10 +81,16 @@ class sunetdrive::script (
     provider => apt,
   }
   $drive_version = '0.3.1'
+  if $facts['os']['distro']['id'] == 'Debian' {
+    $pip_cmd = 'pip3 install --break-system-packages'
+  } else {
+    $pip_cmd = 'python3 -m pip install'
+
+  }
   exec { 'drive-utils':
-    command => "python3.9 -m pip install https://pypi.sunet.se/packages/drive-utils-${drive_version}.tar.gz",
+    command => "${pip_cmd} https://pypi.sunet.se/packages/drive-utils-${drive_version}.tar.gz",
-    unless  => "python3.9 -m pip list | grep drive-utils | grep ${drive_version}",
+    unless  => "python3 -m pip list | grep drive-utils | grep ${drive_version}",
-    require => Package['python3.9'],
+    require => Package['python3'],
   }
   file { '/root/.ssh/':
     ensure => directory,

templates/application/MDU-README.md.erb

@@ -1,13 +1,5 @@
-Hello and welcome to your personal space for research data storage,
+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.  
-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.
+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.
-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. 
+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 
-
-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.

templates/script/restart-db-cluster.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.9
+#!/usr/bin/env python3
 # vim: set filetype=python:
 
 import subprocess

templates/script/restart-nextcloud-farm.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.9
+#!/usr/bin/env python3
 # vim: set filetype=python:
 
 import subprocess