From 5444b02f86bda241c43bc589fb903df66c0fcf7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= <bjorklund@sunet.se>
Date: Thu, 21 Nov 2024 10:30:53 +0100
Subject: [PATCH] Testing stuff for mailgen

---
 .../puppet/modules/soc/manifests/intelmq.pp   | 41 ++++++-------------
 1 file changed, 12 insertions(+), 29 deletions(-)

diff --git a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
index b9e4b82..f27e50a 100644
--- a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
+++ b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
@@ -28,27 +28,21 @@ class soc::intelmq(
       shell      => '/bin/bash',
     }
 
-    file {
-      '/etc/intelmq':
+    file { '/etc/intelmq':
         ensure => directory,
         owner  => 'intelmq',
         group  => 'intelmq',
-        ;
-      '/etc/intelmq/mailgen':
-        ensure => directory,
-        owner  => 'intelmq',
-        group  => 'intelmq',
-        ;
-      '/etc/intelmq/mailgen/formats':
-        ensure => directory,
-        owner  => 'intelmq',
-        group  => 'intelmq',
-        ;
-      '/etc/intelmq/mailgen/templates':
-        ensure => directory,
-        owner  => 'intelmq',
-        group  => 'intelmq',
-        ;
+    }
+
+    # Mailgen stuff
+    file { "All mailgen conf":
+      name    => '/etc/intelmq/mailgen',
+      ensure  => directory,
+      owner   => 'intelmq',
+      group   => 'intelmq',
+      recurse => true,
+      replace => true,
+      source  => "puppet://modules/soc/files/intelmq/mailgen",
     }
 
     file { '/etc/intelmq/api':
@@ -189,17 +183,6 @@ class soc::intelmq(
       }
     }
 
-    # Mailgen stuff
-    file { "All mailgen conf":
-      name    => '/etc/intelmq/mailgen',
-      ensure  => directory,
-      owner   => 'intelmq',
-      group   => 'intelmq',
-      recurse => true,
-      replace => true,
-      source  => "puppet://modules/soc/files/intelmq/mailgen",
-    }
-
   file { '/etc/sudoers.d/01_intelmq-api':
     ensure  => file,
     content => file('soc/intelmq/sudoers-01-intelmq-api'),