Commit 18a58340 authored by zauberstuhl's avatar zauberstuhl
Browse files

Merge branch 'bump_mailserver' into 'master'

bump mailserver to v6.2.1

See merge request !3
parents e367e486 28b8c792
Pipeline #3611 failed with stages
in 8 minutes and 32 seconds
......@@ -5,7 +5,7 @@ WORKDIR $GOPATH/src/git.feneas.org/feneas/infrastructure/microlist
RUN go build -o microlist
RUN mv microlist /tmp/microlist
FROM tvial/docker-mailserver:release-v6.1.0
FROM tvial/docker-mailserver:release-v6.2.1
RUN apt-get update
RUN apt-get install -y patch
......
......@@ -9,7 +9,7 @@
##########################################################################
# >> DEFAULT VARS
#
@@ -582,15 +585,31 @@
@@ -698,15 +701,31 @@ function _setup_ldap() {
done
notify 'inf' 'Starting to override configs'
......@@ -43,7 +43,7 @@
notify 'inf' "Configuring dovecot LDAP"
declare -A _dovecot_ldap_mapping
@@ -626,7 +645,7 @@
@@ -742,7 +761,7 @@ function _setup_ldap() {
notify 'inf' "==> Warning: /etc/postfix/ldap-domains.cf not found"
[ -f /etc/postfix/ldap-aliases.cf -a -f /etc/postfix/ldap-groups.cf ] && \
......@@ -52,13 +52,16 @@
notify 'inf' "==> Warning: /etc/postfix/ldap-aliases.cf or /etc/postfix/ldap-groups.cf not found"
return 0
@@ -763,7 +782,8 @@
@@ -894,7 +913,8 @@ function _setup_postfix_aliases() {
fi
notify 'inf' "Configuring root alias"
- echo "root: ${POSTMASTER_ADDRESS}" > /etc/aliases
+ echo "root: ${POSTMASTER_ADDRESS}
+nanolist: \"| /usr/local/bin/microlist -config /etc/microlist.ini message\"" > /etc/aliases
postalias /etc/aliases
}
+microlist: \"| /usr/local/bin/microlist -config /etc/microlist.ini message\"" > /etc/aliases
if [ -f /tmp/docker-mailserver/postfix-aliases.cf ]; then
cat /tmp/docker-mailserver/postfix-aliases.cf>>/etc/aliases
else
--
2.25.0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment