Skip to content

Minor fixes #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
frugan-dev wants to merge 3 commits into
base: canary
Choose a base branch
from
Open

Minor fixes #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04cdae5
Typo in dkimselector
frugan-dev May 28, 2021
49135fb
Fixed KeyTable https://serverfault.com/a/861701/377751
frugan-dev May 29, 2021
226ab84
Changed apt in apt-get https://github.com/hackafake/hackafake-backend…
frugan-dev Sep 28, 2021
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
10 changes: 6 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ LABEL maintainer="[email protected]"

RUN set -ex; \
\
DEBIAN_FRONTEND=noninteractive apt -yq update && \
DEBIAN_FRONTEND=noninteractive apt -yq install \
#https://github.com/hackafake/hackafake-backend/issues/32#issuecomment-735602580
#https://exerror.com/repository-http-deb-debian-org-debian-buster-updates-inrelease-changed-its-suite-value-from-stable-updates-to-oldstable-updates/
DEBIAN_FRONTEND=noninteractive apt-get -yq --allow-releaseinfo-change update && \
DEBIAN_FRONTEND=noninteractive apt-get -yq install \
supervisor \
ca-certificates \
openssl \
Expand All @@ -19,8 +21,8 @@ RUN set -ex; \
pfqueue \
procps \
&& \
apt -yq autoremove && \
apt -yq clean && \
apt-get -yq autoremove && \
apt-get -yq clean && \
rm -rf /var/log/{apt/*,dpkg.log,alternatives.log} && \
rm -rf /var/log/apt/* && \
rm -rf /var/apt/lists/* && \
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Build local image from repo
-p 587:587 \
-e maildomain=mail.example.com \
-e smtp_user=user:pwd \
-e dkimselector=mail \
-e dkimselector=default \
-v /path/to/domainkeys:/etc/opendkim/domainkeys \
--name postfix \
-d kingsquare/postfix
Expand All @@ -74,7 +74,7 @@ Build local image from repo
-p 587:587 \
-e maildomain=mail.example.com \
-e smtp_user=user:pwd \
-e dkimselector=mail \
-e dkimselector=default \
-v /path/to/etc/opendkim:/etc/opendkim \
--name postfix \
-d kingsquare/postfix
Expand Down
4 changes: 2 additions & 2 deletions src/bin/setup-opendkim.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Canonicalization relaxed/simple

ExternalIgnoreList refile:/etc/opendkim/TrustedHosts
InternalHosts refile:/etc/opendkim/TrustedHosts
KeyTable refile:/etc/opendkim/KeyTable
KeyTable /etc/opendkim/KeyTable
SigningTable refile:/etc/opendkim/SigningTable

Mode sv
Expand Down Expand Up @@ -62,7 +62,7 @@ $maildomain
*.$maildomain
EOF
cat >>/etc/opendkim/KeyTable <<EOF
${dkimselector:-default}._domainkey.$maildomain $maildomain:${dkimselector:-mail}:$(find /etc/opendkim/domainkeys -iname *.private)
${dkimselector:-default}._domainkey.$maildomain $maildomain:${dkimselector:-default}:$(find /etc/opendkim/domainkeys -iname *.private)
EOF
cat >>/etc/opendkim/SigningTable <<EOF
*@$maildomain ${dkimselector:-default}._domainkey.$maildomain
Expand Down