Merge branch 'main' into testing

For full node for now
2023-11-22 11:59:30 +01:00 · 2023-11-22 11:59:15 +01:00
1 changed files with 7 additions and 7 deletions
--- a/manifests/script.pp
+++ b/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,
    }
Author	SHA1	Message	Date
Micke Nordin	3b82d5b0e3	Merge branch 'main' into testing	2023-11-22 11:59:30 +01:00
Micke Nordin	f581835f7c	For full node for now	2023-11-22 11:59:15 +01:00