From cd5063d70bcb79cfcae4f3c69655e3a1dbff3e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bergstr=C3=B6m?= <berra@sunet.se>
Date: Fri, 7 Jul 2023 10:42:18 +0200
Subject: [PATCH] relay fixes

---
 global/overlay/etc/puppet/cosmos-rules.yaml              | 3 +++
 global/overlay/etc/puppet/modules/eid/manifests/relay.pp | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index dc288393..e7aee5c8 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1106,3 +1106,6 @@ eidastest-1.qa.sveidas.se:
    sunet_iaas_cloud:
    autoupdate:
    eid::relay:
+   sunet::server:
+      sshd_config: true
+      ssh_allow_from_anywhere: false
diff --git a/global/overlay/etc/puppet/modules/eid/manifests/relay.pp b/global/overlay/etc/puppet/modules/eid/manifests/relay.pp
index 41f5ace2..e6a581c4 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/relay.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/relay.pp
@@ -1,5 +1,4 @@
-define eid::relay() {
-  package {'postfix': ensure => latest}
+class eid::relay() {
   package {'sasl2-bin': ensure => latest}
   package {'libsasl2-modules': ensure => latest}
   package {'opendkim': ensure => latest}
@@ -14,7 +13,7 @@ define eid::relay() {
 
   sunet::misc::ufw_allow { "allow-dhcp6-546":
       from  => 'any',
-      to    => 'fe80::/64'
+      to    => 'fe80::/64',
       port  => '546',
       proto => 'udp',
   }