From fe9a73841655e678f986aa68594e582753caaddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= <bjorklund@sunet.se>
Date: Tue, 19 Nov 2024 12:51:22 +0100
Subject: [PATCH] Bugfixes for fody.

---
 .../puppet/modules/soc/manifests/intelmq.pp   | 38 +++++++++++++++++--
 .../intelmq/intelmq-mailgen.conf.erb          | 24 ++++++++++++
 2 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-mailgen.conf.erb

diff --git a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
index 12bed53..9ee51e6 100644
--- a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
+++ b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
@@ -26,10 +26,32 @@ class soc::intelmq(
     shell      => '/bin/bash',
   }
 
-  file { '/etc/intelmq':
-    ensure => directory,
-    owner  => 'intelmq',
-    group  => '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/gnupghome':
+      ensure => directory,
+      owner  => 'intelmq',
+      group  => 'intelmq',
+      ;
+    '/etc/intelmq/mailgen/templates':
+      ensure => directory,
+      owner  => 'intelmq',
+      group  => 'intelmq',
+      ;
   }
 
   file { '/etc/intelmq/api':
@@ -246,6 +268,14 @@ class soc::intelmq(
       mode    => '0440',
       content => template('soc/intelmq/tickets-serve.conf.erb'),
     ;
+    '/etc/intelmq/intelmq-mailgen.conf':
+      ensure  => file,
+      owner   => 'intelmq',
+      group   => 'www-data',
+      mode    => '0440',
+      content => template('soc/intelmq/intelmq-mailgen.conf.erb'),
+    ;
+
   }
 
   file { '/etc/systemd/system/intelmq-api.service':
diff --git a/global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-mailgen.conf.erb b/global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-mailgen.conf.erb
new file mode 100644
index 0000000..44f46c8
--- /dev/null
+++ b/global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-mailgen.conf.erb
@@ -0,0 +1,24 @@
+{
+    "openpgp": {
+    "gnupg_home" : "/etc/intelmq/mailgen/gnupghome",
+    "always_sign" : false,
+    "signing_key" : "5F503EFAC8C89323D54C252591B8CD7E15925678"
+    },
+    "database": {
+        "event": {
+            "name": "eventdb",
+            "username": "<%= @db_user %>",
+            "password": "<%= @db_pass %>",
+            "host": "localhost",
+            "port": 5432
+        }
+    },
+    "template_dir": "/etc/intelmq/mailgen/templates",
+    "script_directory": "/etc/intelmq/mailgen/formats",
+    "sender": "cert@cert.sunet.se",
+    "smtp": {
+        "host": "localhost",
+        "port": 25
+    },
+    "logging_level": "INFO"
+}