Skip to content

Commit

Permalink
🍕 Update deps and aliases
Browse files Browse the repository at this point in the history
Signed-off-by: Edward Fitz Abucay <ffimnsr@gmail.com>
  • Loading branch information
ffimnsr committed Oct 20, 2023
1 parent 45c8d65 commit 80b62ec
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
RUN apk add --no-cache \
postfix opendkim opendkim-utils \
ca-certificates tzdata bash \
musl musl-utils s6-overlay
mailx musl musl-utils s6-overlay

RUN wget -O - \
https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | tar xzf - -C /usr/local/bin
Expand Down
2 changes: 1 addition & 1 deletion data/s6-overlay/s6-rc.d/init-mailer-config/run
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ mkdir /run/opendkim \

TEMPLATES_DIR=/etc/templates
dockerize \
-template $TEMPLATES_DIR/postfix/aliases.tmpl:/etc/aliases \
-template $TEMPLATES_DIR/postfix/aliases.tmpl:/etc/postfix/aliases \
-template $TEMPLATES_DIR/postfix/generic.tmpl:/etc/postfix/generic \
-template $TEMPLATES_DIR/postfix/main.cf.tmpl:/etc/postfix/main.cf \
-template $TEMPLATES_DIR/postfix/master.cf.tmpl:/etc/postfix/master.cf \
Expand Down
4 changes: 4 additions & 0 deletions data/templates/postfix/aliases.tmpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
mailer-daemon: root
postmaster: root
admin: root
noreply: root
operator: root
abuse: root
decode: root
root: {{ .Env.JMAIL_ROOT_EMAIL }}
4 changes: 2 additions & 2 deletions data/templates/postfix/main.cf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ milter_default_action = accept
milter_protocol = 6
non_smtpd_milters = $smtpd_milters

alias_maps = lmdb:/etc/aliases
alias_database = lmdb:/etc/aliases
alias_maps = lmdb:/etc/postfix/aliases
alias_database = lmdb:/etc/postfix/aliases
relayhost =
mailbox_size_limit = 0
recipient_delimiter = +
Expand Down

0 comments on commit 80b62ec

Please sign in to comment.