Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ecdsa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ldap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ldap2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reverse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sieve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/traefik_acmev1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/traefik_acmev2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mailserver2/debian-mail-overlay:1.0.12
FROM mailserver2/debian-mail-overlay:1.0.14

LABEL description="Simple and full-featured mail server using Docker"

Expand Down
12 changes: 12 additions & 0 deletions rootfs/etc/postfix/main.cf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@ mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 {{ .RELAY_NETWORKS

alias_maps = hash:/etc/aliases


################################
## SMTP smuggling mitigation ##
################################
smtpd_forbid_bare_newline = yes
smtpd_forbid_bare_newline_exclusions = $mynetworks

# https://www.postfix.org/smtp-smuggling.html#long
# Optionally disconnect remote SMTP clients that send bare newlines,
# but allow local clients with non-standard SMTP implementations
# such as netcat, fax machines, or load balancer health checks.

###############
## SMTP/UTF8 ##
###############
Expand Down
3 changes: 3 additions & 0 deletions rootfs/etc/rsyslog/rsyslog.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ $IncludeConfig /etc/rsyslog.d/*.conf
# https://github.com/vstakhov/rspamd/issues/1693
:msg,contains,"map file is unavailable for reading" ~
:msg,contains,"cannot load controller stats from /var/mail/rspamd/stats.ucl" ~
:msg,contains,"rspamd_register_symbol_fromlua: duplicate symbol" ~
:msg,contains,"trying to add virtual symbol MID" ~
:msg,contains,"init of /usr/share/rspamd/lualib/lua_ffi/spf.lua failed" ~
:msg,contains,"database is locked" ~
:msg,contains,"http error occurred: IO read error: unexpected EOF" ~
:msg,contains,"http error occurred: Not found" ~
Expand Down