mirror of
https://github.com/zulip/zulip.git
synced 2025-10-23 04:52:12 +00:00
email-mirror: Remove HTTP interface.
This commit is contained in:
Alex Vandiver
committed by
Tim Abbott
Tim Abbott
parent
a6a5fc246a
commit
c6e0f0b436
@@ -1,9 +0,0 @@
|
||||
# This is the list of email addresses that are accepted via SMTP;
|
||||
# these consist of only the addresses in `virtual`, as well as the
|
||||
# RFC822-specified postmaster.
|
||||
|
||||
/\+.*@/ OK
|
||||
/\..*@/ OK
|
||||
/^mm.{32}@/ OK
|
||||
|
||||
/^postmaster@/ OK
|
||||
@@ -1,114 +0,0 @@
|
||||
#
|
||||
# Postfix master process configuration file. For details on the format
|
||||
# of the file, see the master(5) manual page (command: "man 5 master").
|
||||
#
|
||||
# Do not forget to execute "postfix reload" after editing this file.
|
||||
#
|
||||
# ==========================================================================
|
||||
# service type private unpriv chroot wakeup maxproc command + args
|
||||
# (yes) (yes) (yes) (never) (100)
|
||||
# ==========================================================================
|
||||
smtp inet n - - - - smtpd
|
||||
#smtp inet n - - - 1 postscreen
|
||||
#smtpd pass - - - - - smtpd
|
||||
#dnsblog unix - - - - 0 dnsblog
|
||||
#tlsproxy unix - - - - 0 tlsproxy
|
||||
#submission inet n - - - - smtpd
|
||||
# -o syslog_name=postfix/submission
|
||||
# -o smtpd_tls_security_level=encrypt
|
||||
# -o smtpd_sasl_auth_enable=yes
|
||||
# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
||||
# -o milter_macro_daemon_name=ORIGINATING
|
||||
#smtps inet n - - - - smtpd
|
||||
# -o syslog_name=postfix/smtps
|
||||
# -o smtpd_tls_wrappermode=yes
|
||||
# -o smtpd_sasl_auth_enable=yes
|
||||
# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
||||
# -o milter_macro_daemon_name=ORIGINATING
|
||||
#628 inet n - - - - qmqpd
|
||||
pickup fifo n - - 60 1 pickup
|
||||
cleanup unix n - - - 0 cleanup
|
||||
qmgr fifo n - n 300 1 qmgr
|
||||
#qmgr fifo n - n 300 1 oqmgr
|
||||
tlsmgr unix - - - 1000? 1 tlsmgr
|
||||
rewrite unix - - - - - trivial-rewrite
|
||||
bounce unix - - - - 0 bounce
|
||||
defer unix - - - - 0 bounce
|
||||
trace unix - - - - 0 bounce
|
||||
verify unix - - - - 1 verify
|
||||
flush unix n - - 1000? 0 flush
|
||||
proxymap unix - - n - - proxymap
|
||||
proxywrite unix - - n - 1 proxymap
|
||||
smtp unix - - - - - smtp
|
||||
relay unix - - - - - smtp
|
||||
# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
|
||||
showq unix n - - - - showq
|
||||
error unix - - - - - error
|
||||
retry unix - - - - - error
|
||||
discard unix - - - - - discard
|
||||
local unix - n n - - local
|
||||
virtual unix - n n - - virtual
|
||||
lmtp unix - - - - - lmtp
|
||||
anvil unix - - - - 1 anvil
|
||||
scache unix - - - - 1 scache
|
||||
#
|
||||
# ====================================================================
|
||||
# Interfaces to non-Postfix software. Be sure to examine the manual
|
||||
# pages of the non-Postfix software to find out what options it wants.
|
||||
#
|
||||
# Many of the following services use the Postfix pipe(8) delivery
|
||||
# agent. See the pipe(8) man page for information about ${recipient}
|
||||
# and other message envelope options.
|
||||
# ====================================================================
|
||||
#
|
||||
# maildrop. See the Postfix MAILDROP_README file for details.
|
||||
# Also specify in main.cf: maildrop_destination_recipient_limit=1
|
||||
#
|
||||
maildrop unix - n n - - pipe
|
||||
flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}
|
||||
#
|
||||
# ====================================================================
|
||||
#
|
||||
# Recent Cyrus versions can use the existing "lmtp" master.cf entry.
|
||||
#
|
||||
# Specify in cyrus.conf:
|
||||
# lmtp cmd="lmtpd -a" listen="localhost:lmtp" proto=tcp4
|
||||
#
|
||||
# Specify in main.cf one or more of the following:
|
||||
# mailbox_transport = lmtp:inet:localhost
|
||||
# virtual_transport = lmtp:inet:localhost
|
||||
#
|
||||
# ====================================================================
|
||||
#
|
||||
# Cyrus 2.1.5 (Amos Gouaux)
|
||||
# Also specify in main.cf: cyrus_destination_recipient_limit=1
|
||||
#
|
||||
#cyrus unix - n n - - pipe
|
||||
# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
|
||||
#
|
||||
# ====================================================================
|
||||
# Old example of delivery via Cyrus.
|
||||
#
|
||||
#old-cyrus unix - n n - - pipe
|
||||
# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
|
||||
#
|
||||
# ====================================================================
|
||||
#
|
||||
# See the Postfix UUCP_README file for configuration details.
|
||||
#
|
||||
uucp unix - n n - - pipe
|
||||
flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
|
||||
#
|
||||
# Other external delivery methods.
|
||||
#
|
||||
ifmail unix - n n - - pipe
|
||||
flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
|
||||
bsmtp unix - n n - - pipe
|
||||
flags=Fq. user=bsmtp argv=/usr/lib/bsmtp/bsmtp -t$nexthop -f$sender $recipient
|
||||
scalemail-backend unix - n n - 2 pipe
|
||||
flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store ${nexthop} ${user} ${extension}
|
||||
mailman unix - n n - - pipe
|
||||
flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
|
||||
${nexthop} ${user}
|
||||
zulip unix - n n - - pipe
|
||||
flags= user=zulip argv=/home/zulip/deployments/current/scripts/lib/email-mirror-postfix -r ${original_recipient}
|
||||
@@ -1 +0,0 @@
|
||||
zulip@localhost zulip:
|
||||
@@ -1,81 +0,0 @@
|
||||
class zulip::postfix_localmail {
|
||||
include zulip::snakeoil
|
||||
$postfix_packages = [ 'postfix', ]
|
||||
|
||||
$fqdn = $facts['networking']['fqdn']
|
||||
if $fqdn == '' {
|
||||
fail('Your system does not have a fully-qualified domain name defined. See hostname(1).')
|
||||
}
|
||||
$postfix_mailname = zulipconf('postfix', 'mailname', $fqdn)
|
||||
package { $postfix_packages:
|
||||
ensure => installed,
|
||||
require => File['/etc/mailname'],
|
||||
}
|
||||
|
||||
service { 'postfix':
|
||||
require => Exec['generate-default-snakeoil'],
|
||||
}
|
||||
|
||||
file {'/etc/mailname':
|
||||
ensure => file,
|
||||
mode => '0644',
|
||||
owner => root,
|
||||
group => root,
|
||||
content => $postfix_mailname,
|
||||
}
|
||||
|
||||
file {'/etc/postfix/main.cf':
|
||||
ensure => file,
|
||||
mode => '0644',
|
||||
owner => root,
|
||||
group => root,
|
||||
content => template('zulip/postfix/main.cf.erb'),
|
||||
require => Package[postfix],
|
||||
notify => Service['postfix'],
|
||||
}
|
||||
file {'/etc/postfix/master.cf':
|
||||
ensure => file,
|
||||
mode => '0644',
|
||||
owner => root,
|
||||
group => root,
|
||||
source => 'puppet:///modules/zulip/postfix/master.cf',
|
||||
require => Package[postfix],
|
||||
notify => Service['postfix'],
|
||||
}
|
||||
|
||||
file {'/etc/postfix/virtual':
|
||||
ensure => file,
|
||||
mode => '0644',
|
||||
owner => root,
|
||||
group => root,
|
||||
content => template('zulip/postfix/virtual.erb'),
|
||||
require => Package[postfix],
|
||||
notify => Service['postfix'],
|
||||
}
|
||||
|
||||
file {'/etc/postfix/transport':
|
||||
ensure => file,
|
||||
mode => '0644',
|
||||
owner => root,
|
||||
group => root,
|
||||
source => 'puppet:///modules/zulip/postfix/transport',
|
||||
require => Package[postfix],
|
||||
}
|
||||
exec {'postmap /etc/postfix/transport':
|
||||
subscribe => File['/etc/postfix/transport'],
|
||||
refreshonly => true,
|
||||
require => [
|
||||
File['/etc/postfix/main.cf'],
|
||||
Package[postfix],
|
||||
],
|
||||
}
|
||||
|
||||
file {'/etc/postfix/access':
|
||||
ensure => file,
|
||||
mode => '0644',
|
||||
owner => root,
|
||||
group => root,
|
||||
source => 'puppet:///modules/zulip/postfix/access',
|
||||
require => Package[postfix],
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
class zulip::snakeoil {
|
||||
zulip::safepackage { 'ssl-cert': ensure => installed }
|
||||
|
||||
# We use the snakeoil certificate for PostgreSQL and Postfix; some VMs
|
||||
# install the `ssl-cert` package but (reasonably) don't build the
|
||||
# snakeoil certs into the image; build them as needed.
|
||||
# We use the snakeoil certificate for PostgreSQL; some VMs install
|
||||
# the `ssl-cert` package but (reasonably) don't build the snakeoil
|
||||
# certs into the image; build them as needed.
|
||||
exec { 'generate-default-snakeoil':
|
||||
require => Package['ssl-cert'],
|
||||
creates => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
# This file is managed by Puppet; local changes will be overridden.
|
||||
|
||||
smtpd_banner = $myhostname ESMTP $mail_name (Zulip)
|
||||
biff = no
|
||||
|
||||
# appending .domain is the MUA's job.
|
||||
append_dot_mydomain = no
|
||||
|
||||
readme_directory = no
|
||||
|
||||
# TLS parameters
|
||||
smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
|
||||
smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
|
||||
smtpd_use_tls=yes
|
||||
smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
|
||||
smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
|
||||
|
||||
smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated reject_unauth_destination
|
||||
smtpd_recipient_restrictions = permit_mynetworks, check_recipient_access regexp:/etc/postfix/access, reject
|
||||
myhostname = <%= @fqdn %>
|
||||
alias_maps = hash:/etc/aliases
|
||||
alias_database = hash:/etc/aliases
|
||||
transport_maps = hash:/etc/postfix/transport
|
||||
myorigin = /etc/mailname
|
||||
mydestination = localhost, <%= @postfix_mailname %>
|
||||
relayhost =
|
||||
mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
|
||||
mailbox_size_limit = 0
|
||||
recipient_delimiter = +
|
||||
inet_interfaces = all
|
||||
inet_protocols = all
|
||||
|
||||
# This enables us to do a catchall
|
||||
virtual_alias_maps = regexp:/etc/postfix/virtual
|
||||
|
||||
# Needed to accept mail with percents without trying to interpret as
|
||||
# percent-style routing.
|
||||
allow_percent_hack = no
|
||||
allow_untrusted_routing = yes
|
||||
strict_rfc821_envelopes = no
|
||||
|
||||
# Ingest messages up to 25MB
|
||||
message_size_limit = 26214400
|
||||
@@ -1,7 +0,0 @@
|
||||
if /@<%= Regexp.escape(@postfix_mailname) %>\.?$/
|
||||
# Changes to this list require a corresponding change to `access` as
|
||||
# well.
|
||||
/\+.*@/ zulip@localhost
|
||||
/\..*@/ zulip@localhost
|
||||
/^mm.{32}@/ zulip@localhost
|
||||
endif
|
||||
Reference in New Issue
Block a user