Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow accounts which do not start with a-z (#568)

This commit is contained in:
mplx 2017-04-07 22:28:19 +02:00 committed by Thomas VIAL
parent 912cb5676b
commit 4536113a30
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/start-mailserver.sh
View File

@ -463,7 +463,8 @@ function _setup_dovecot_local_user() {
# Creating users # Creating users
# 'pass' is encrypted # 'pass' is encrypted
grep "^[a-z]" /tmp/docker-mailserver/postfix-accounts.cf | while IFS=$'|' read login pass # comments and empty lines are ignored
grep -v "^\s*$\|^\s*\#" /tmp/docker-mailserver/postfix-accounts.cf | while IFS=$'|' read login pass
do do
# Setting variables for better readability # Setting variables for better readability
user=$(echo ${login} | cut -d @ -f1) user=$(echo ${login} | cut -d @ -f1)
@ -805,7 +806,8 @@ function _setup_postfix_override_configuration() {
if [ -f /tmp/docker-mailserver/postfix-main.cf ]; then if [ -f /tmp/docker-mailserver/postfix-main.cf ]; then
while read line; do while read line; do
# line should start with a letter (avoid comments and new lines) # all valid postfix options start with a lower case letter
# http://www.postfix.org/postconf.5.html
if [[ "$line" =~ ^[a-z] ]]; then if [[ "$line" =~ ^[a-z] ]]; then
postconf -e "$line" postconf -e "$line"
fi fi

2
test/config/postfix-main.cf
View File

@ -1,5 +1,5 @@
recipient_delimiter = ~ recipient_delimiter = ~
max_idle = 600s max_idle = 600s
# this is a comment # this is a comment
# this is also a comment
readme_directory = /tmp readme_directory = /tmp