From 914585ab8ea0886f4eecdee1676833f8e1135cfb Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 11:17:45 +0200
Subject: [PATCH 1/1] Re-tag the store/collect ferm rule for mailrelays to
 satelliltes from smtp::server::from::mailrelay to
 smtp::server::to::mail-satellite

---
 modules/roles/manifests/mailrelay.pp | 2 +-
 modules/roles/manifests/mta.pp       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index 2fba6a6aa..8bf8bee88 100644
--- a/modules/roles/manifests/mailrelay.pp
+++ b/modules/roles/manifests/mailrelay.pp
@@ -26,7 +26,7 @@ class roles::mailrelay {
   # smtp firewalling setup
   ###
   @@ferm::rule::simple { "dsa-smtp-from-mailrelay-${::fqdn}":
-    tag         => 'smtp::server::from::mailrelay',
+    tag         => 'smtp::server::to::mail-satellite',
     description => 'Allow smtp access from a mailrelay',
     port        => '7', # will be overwritten on collection
     saddr       => $base::public_addresses,
diff --git a/modules/roles/manifests/mta.pp b/modules/roles/manifests/mta.pp
index 2c0ca4eeb..1dc8fae1a 100644
--- a/modules/roles/manifests/mta.pp
+++ b/modules/roles/manifests/mta.pp
@@ -39,7 +39,7 @@ class roles::mta(
       }
     }
 
-    Ferm::Rule::Simple <<| tag == 'smtp::server::from::mailrelay' |>> {
+    Ferm::Rule::Simple <<| tag == 'smtp::server::to::mail-satellite' |>> {
       port => $mailport == undef ? {
         true    => 25,
         default => $mailport,
-- 
2.20.1