Commit 6e3ed8fa authored by Marc Fournier's avatar Marc Fournier
Browse files

postfix: split stuff common between debian and redhat in a seperate file.

parent a4dc1017
Loading
Loading
Loading
Loading
+2 −5
Changes for manifests/classes/postfix.pp: 2 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -89,11 +89,8 @@ class postfix {
    group => "root",
    mode => "0644",
    content => $operatingsystem ? {
      Redhat => template("postfix/master.cf.redhat.erb"),
      CentOS => template("postfix/master.cf.redhat.erb"),
      Debian => template("postfix/master.cf.debian.erb"),
      Ubuntu => template("postfix/master.cf.debian.erb"),
      "GNU/kFreeBSD" => template("postfix/master.cf.debian.erb"),
      /Redhat|CentOS/ => template("postfix/master.cf.redhat.erb", "postfix/master.cf.common.erb"),
      /Debian|Ubuntu|kFreeBSD/ => template("postfix/master.cf.debian.erb", "postfix/master.cf.common.erb"),
    },
    seltype => $postfix_seltype,
    notify  => Service["postfix"],
+33 −0
Changes for templates/master.cf.common.erb: 33 added lines, 0 removed lines.
Original line number Diff line number Diff line
<% if has_variable?("postfix_use_amavisd") and postfix_use_amavisd == 'yes' %>
amavis unix - - - - 2 smtp
        -o smtp_data_done_timeout=1200
        -o smtp_send_xforward_command=yes

127.0.0.1:10025 inet n - - - - smtpd
        -o content_filter=
        -o local_recipient_maps=
        -o relay_recipient_maps=
        -o smtpd_restriction_classes=
        -o smtpd_client_restrictions=
        -o smtpd_helo_restrictions=
        -o smtpd_sender_restrictions=
        -o smtpd_recipient_restrictions=permit_mynetworks,reject
        -o mynetworks=127.0.0.0/8
        -o strict_rfc821_envelopes=yes
        -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
        -o smtpd_bind_address=127.0.0.1
<% end -%>
<% if has_variable?("postfix_use_dovecot_lda") and postfix_use_dovecot_lda == 'yes' %>
dovecot   unix  -       n       n       -       -       pipe
  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient}
<% end -%>
<% if has_variable?("postfix_use_schleuder") and postfix_use_schleuder == 'yes' %>
schleuder  unix  -       n       n       -       -       pipe
  flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
<% end -%>
<% if has_variable?("postfix_use_sympa") and postfix_use_sympa == 'yes' %>
sympa        unix  -       n       n       -       -       pipe
  flags=R user=sympa argv=/usr/lib/sympa/bin/queue ${recipient}
sympabounce  unix  -       n       n       -       -       pipe
  flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${user}
<% end -%>
+0 −33
Changes for templates/master.cf.debian.erb: 0 added lines, 33 removed lines.
Original line number Diff line number Diff line
@@ -78,36 +78,3 @@ scalemail-backend unix - n n - 2 pipe
mailman   unix  -       n       n       -       -       pipe
  flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
  ${nexthop} ${user}
<% if has_variable?("postfix_use_amavisd") and postfix_use_amavisd == 'yes' %>
amavis unix - - - - 2 smtp
        -o smtp_data_done_timeout=1200
        -o smtp_send_xforward_command=yes

127.0.0.1:10025 inet n - - - - smtpd
        -o content_filter=
        -o local_recipient_maps=
        -o relay_recipient_maps=
        -o smtpd_restriction_classes=
        -o smtpd_client_restrictions=
        -o smtpd_helo_restrictions=
        -o smtpd_sender_restrictions=
        -o smtpd_recipient_restrictions=permit_mynetworks,reject
        -o mynetworks=127.0.0.0/8
        -o strict_rfc821_envelopes=yes
        -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
        -o smtpd_bind_address=127.0.0.1
<% end -%>
<% if has_variable?("postfix_use_dovecot_lda") and postfix_use_dovecot_lda == 'yes' %>
dovecot   unix  -       n       n       -       -       pipe
  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient}
<% end -%>
<% if has_variable?("postfix_use_schleuder") and postfix_use_schleuder == 'yes' %>
schleuder  unix  -       n       n       -       -       pipe
  flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
<% end -%>
<% if has_variable?("postfix_use_sympa") and postfix_use_sympa == 'yes' %>
sympa        unix  -       n       n       -       -       pipe
  flags=R user=sympa argv=/usr/lib/sympa/bin/queue ${recipient}
sympabounce  unix  -       n       n       -       -       pipe
  flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${user}
<% end -%>
+4 −0
Changes for templates/master.cf.redhat.erb: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,7 +7,11 @@
# service type  private unpriv  chroot  wakeup  maxproc command + args
#               (yes)   (yes)   (yes)   (never) (100)
# ==========================================================================
<% if postfix_smtp_listen == 'all' -%>
smtp      inet  n       -       n       -       -       smtpd
<% else -%>
<%= postfix_smtp_listen %>:smtp      inet  n       -       n       -       -       smtpd
<% end -%>
#smtp      inet  n       -       n       -       -       smtpd
#submission inet n       -       n       -       -       smtpd
#  -o smtpd_enforce_tls=yes