From b45d265a08884a65e7100e34067a0d8c390da8f0 Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Mon, 24 Mar 2014 08:07:18 +0100
Subject: fixes #5360 adds admin@ as reserved address + linting

---
 puppet/modules/site_postfix/manifests/mx/reserved_aliases.pp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'puppet/modules/site_postfix/manifests/mx')

diff --git a/puppet/modules/site_postfix/manifests/mx/reserved_aliases.pp b/puppet/modules/site_postfix/manifests/mx/reserved_aliases.pp
index aea66f78..83e27376 100644
--- a/puppet/modules/site_postfix/manifests/mx/reserved_aliases.pp
+++ b/puppet/modules/site_postfix/manifests/mx/reserved_aliases.pp
@@ -1,11 +1,13 @@
+# Defines which mail addresses shouldn't be available and where they should fwd
 class site_postfix::mx::reserved_aliases {
 
   postfix::mailalias {
-    [ 'postmaster', 'hostmaster', 'domainadmin', 'certmaster', 'ssladmin',
-      'arin-admin', 'administrator', 'webmaster', 'www-data', 'www',
-      'nobody', 'sys', 'postgresql', 'mysql', 'bin', 'cron', 'lp', 'games',
-      'maildrop', 'abuse', 'noc', 'security', 'usenet', 'news', 'uucp',
-      'ftp' ]:
+    [ 'abuse', 'admin', 'arin-admin', 'administrator', 'bin', 'cron',
+      'certmaster', 'domainadmin', 'games', 'ftp', 'hostmaster', 'lp',
+      'maildrop', 'mysql', 'news', 'nobody', 'noc', 'postmaster', 'postgresql',
+      'security', 'ssladmin', 'sys', 'usenet', 'uucp', 'webmaster', 'www',
+      'www-data',
+    ]:
       ensure    => present,
       recipient => 'root'
   }
-- 
cgit v1.2.3


From 1551f785c5c7c515781995928eec7659365d8988 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Wed, 2 Apr 2014 15:35:01 -0400
Subject: Force satellite hosts that only speak to relayhost to have a
 smtp_tls_security_level of 'encrypt', so it is not optional (#1902)

Change-Id: I61ad0823e3eb8df6c224767d63f0911dcba42a16
---
 puppet/modules/site_postfix/manifests/mx/smtp_tls.pp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'puppet/modules/site_postfix/manifests/mx')

diff --git a/puppet/modules/site_postfix/manifests/mx/smtp_tls.pp b/puppet/modules/site_postfix/manifests/mx/smtp_tls.pp
index 3cc7ea72..d9b59f40 100644
--- a/puppet/modules/site_postfix/manifests/mx/smtp_tls.pp
+++ b/puppet/modules/site_postfix/manifests/mx/smtp_tls.pp
@@ -20,8 +20,6 @@ class site_postfix::mx::smtp_tls {
       value => 'sha1';
     'smtp_tls_session_cache_database':
       value => 'btree:${data_directory}/smtp_cache';
-    'smtp_tls_security_level':
-      value  => 'may';
     # see issue #4011
     'smtp_tls_protocols':
       value => '!SSLv2, !SSLv3';
-- 
cgit v1.2.3