From 5d02892ed5627fc831f295093a6c39757a57c9a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= <bjorklund@sunet.se>
Date: Thu, 14 Nov 2024 10:51:10 +0100
Subject: [PATCH] Fixes with installation script.

---
 .../modules/soc/files/intelmq/sudoers-01-intelmq-api  |  2 ++
 .../etc/puppet/modules/soc/manifests/intelmq.pp       | 11 +++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 global/overlay/etc/puppet/modules/soc/files/intelmq/sudoers-01-intelmq-api

diff --git a/global/overlay/etc/puppet/modules/soc/files/intelmq/sudoers-01-intelmq-api b/global/overlay/etc/puppet/modules/soc/files/intelmq/sudoers-01-intelmq-api
new file mode 100644
index 0000000..4ae4fd8
--- /dev/null
+++ b/global/overlay/etc/puppet/modules/soc/files/intelmq/sudoers-01-intelmq-api
@@ -0,0 +1,2 @@
+Defaults:www-data	secure_path =	/opt/intelmq/venv/bin:/bin:/usr/bin:/usr/local/bin
+www-data ALL=(intelmq)	NOPASSWD:	/opt/intelmq/venv/bin/intelmqctl
diff --git a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
index 80560b5..b6c51e3 100644
--- a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
+++ b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
@@ -42,4 +42,15 @@ class soc::intelmq(
   exec { 'sudo -u intelmq /opt/intelmq/install-intelmq.sh':
     creates =>  '/opt/intelmq/.installed'
   }
+
+  exec { '/opt/intelmq/venv/bin/intelmqsetup --state-file /opt/intelmq/.setup_state':
+    creates =>  '/opt/intelmq/.setup_state'
+  }
+
+  file { 'etc/sudoers.d/01_intelmq-api':
+    ensure  => file,
+    content => file('soc/intelmq/sudoers-01-intelmq-api'),
+    mode    => '0440',
+  }
+
 }