! too much spam !

diff --git a/manifests/postfix.pp b/manifests/postfix.pp
index 506af5c..9bee275 100644 (file)
--- a/manifests/postfix.pp
+++ b/manifests/postfix.pp
@@ -34,6 +34,14 @@ class hgr::postfix {
          mode => "0644",
          notify => Service["postfix"],
          require => [Package["postfix","spamassassin"]];
          mode => "0644",
          notify => Service["postfix"],
          require => [Package["postfix","spamassassin"]];

+      # TODO:  need to run portmap on this file after updating it / before restarting postfix
+      "/etc/postfix/send_access":
+         ensure => present,
+         owner => "root",
+         group => "root",
+          mode => "0644",
+         notify => Service["postfix"],
+         require => Package["postfix"];

       "/etc/procmailrc":
          ensure => present,
          source => "puppet:///modules/hgr/procmailrc",
       "/etc/procmailrc":
          ensure => present,
          source => "puppet:///modules/hgr/procmailrc",


@@ -41,8 +49,6 @@ class hgr::postfix {
          group => "root",
          mode => "0644",
          require => Package["procmail"];
          group => "root",
          mode => "0644",
          require => Package["procmail"];

-
-

   }
 
   service {
   }
 
   service {


@@ -51,8 +57,4 @@ class hgr::postfix {
        enable => true,
        require => Package["postfix"];
   }
        enable => true,
        require => Package["postfix"];
   }

-
-
-    
-

 }
 }

diff --git a/templates/postfix/main.cf.erb b/templates/postfix/main.cf.erb
index bfc7bb0..4710d59 100644 (file)
--- a/templates/postfix/main.cf.erb
+++ b/templates/postfix/main.cf.erb
@@ -61,5 +61,7 @@ smtpd_recipient_restrictions = reject_unauth_pipelining,
   permit_mynetworks,
   reject_non_fqdn_recipient,
   reject_unknown_recipient_domain,
   permit_mynetworks,
   reject_non_fqdn_recipient,
   reject_unknown_recipient_domain,

-  reject_unauth_destination
+  reject_unauth_destination,
+  reject_rbl_client sbl-xbl.spamhaus.org,  
+  check_sender_access hash:/etc/postfix/sender_access

 relay_domains = <%= scope.lookupvar('::fqdn') %>
 relay_domains = <%= scope.lookupvar('::fqdn') %>