Merge branch 'main' into testing

manifests/script.pp

@@ -327,13 +327,6 @@ class sunetdrive::script (
       group   => 'root',
       mode    => '0700',
     }
-    file { '/root/tasks/delete_announcement_with_subject.sh':
-      ensure  => file,
-      content => template('sunetdrive/script/delete_announcement_with_subject.erb.sh'),
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0700',
-    }
     file { '/root/tasks/backupmultinodedb.sh':
       ensure  => file,
       content => template('sunetdrive/script/backupmultinodedb.erb.sh'),
@@ -422,6 +415,13 @@ class sunetdrive::script (
       group   => 'root',
       mode    => '0700',
     }
+    file { '/root/tasks/delete_announcement_with_subject.sh':
+      ensure  => file,
+      content => template('sunetdrive/script/delete_announcement_with_subject.erb.sh'),
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0700',
+    }
     file { '/root/tasks/backupmultinodedb.sh':
       ensure  => absent,
     }