🍕 Fix problems on DKIM

Signed-off-by: Edward Fitz Abucay <ffimnsr@gmail.com>
ffimnsr · Oct 20, 2023 · 63197ab · 63197ab
1 parent 80b62ec
commit 63197ab
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/build-push-release.yml → ...b/workflows/build-push-release-images.yml b/.github/workflows/build-push-release.yml → ...b/workflows/build-push-release-images.yml
@@ -1,9 +1,9 @@
-name: build-push-release
+name: build-push-release-images
 on:
   push:
-    tags: 
+    tags:
       - 'release-*.*.*'
-    
+
 env:
   # Use docker.io for Docker Hub if empty
   REGISTRY: ghcr.io

diff --git a/data/s6-overlay/s6-rc.d/init-mailer-config/run b/data/s6-overlay/s6-rc.d/init-mailer-config/run
@@ -8,10 +8,10 @@ mkdir -p /var/spool/postfix/pid \
   && chown -R 0:0 /var/spool/postfix/pid
 
 mkdir -p /var/spool/postfix/opendkim \
-  && chown -R opendkim:postfix /var/spool/postfix/opendkim
+  && chown -R 0:0 /var/spool/postfix/opendkim
 
 mkdir /run/opendkim \
-  && chown -R opendkim:opendkim /run/opendkim
+  && chown -R 0:0 /run/opendkim
 
 TEMPLATES_DIR=/etc/templates
 dockerize \
@@ -54,7 +54,7 @@ if [[ ! -d "${OPENDKIM_KEYS_DIR}" ]]; then
   echo "Creating DKIM keys for $JMAIL_ORIGIN"
   mkdir -p $OPENDKIM_KEYS_DIR
   opendkim-genkey -b 1024 -d $JMAIL_ORIGIN -D $OPENDKIM_KEYS_DIR -s sendonly
-  chown -R opendkim: $OPENDKIM_KEYS_DIR/sendonly.private
+  chown -R 0:0 $OPENDKIM_KEYS_DIR/sendonly.private
 fi
 
 cat $OPENDKIM_KEYS_DIR/sendonly.txt
diff --git a/data/templates/opendkim/key.table.tmpl b/data/templates/opendkim/key.table.tmpl
@@ -1 +1 @@
-sendonly._domainkey.{{ .Env.JMAIL_ORIGIN }} {{ .Env.JMAIL_ORIGIN}}:sendonly:/etc/opendkim/keys/{{ .Env.JMAIL_ORIGIN }}/sendonly.private
+sendonly._domainkey.{{ .Env.JMAIL_ORIGIN }} {{ .Env.JMAIL_ORIGIN }}:sendonly:/etc/opendkim/keys/{{ .Env.JMAIL_ORIGIN }}/sendonly.private
diff --git a/data/templates/opendkim/opendkim.conf.tmpl b/data/templates/opendkim/opendkim.conf.tmpl
@@ -19,6 +19,5 @@ Socket                  local:/var/spool/postfix/opendkim/opendkim.sock
 
 ReportAddress           postmaster@{{ .Env.JMAIL_ORIGIN }}
 SendReports             yes
-UserID                  opendkim
 
 InternalHosts           refile:/etc/opendkim/trusted.hosts
diff --git a/data/templates/opendkim/signing.table.tmpl b/data/templates/opendkim/signing.table.tmpl
@@ -1 +1,2 @@
 *@{{ .Env.JMAIL_ORIGIN }} sendonly._domainkey.{{ .Env.JMAIL_ORIGIN }}
+*@*.{{ .Env.JMAIL_ORIGIN }} sendonly._domainkey.{{ .Env.JMAIL_ORIGIN }}
diff --git a/data/templates/opendkim/trusted.hosts.tmpl b/data/templates/opendkim/trusted.hosts.tmpl
@@ -6,4 +6,5 @@ localhost
 172.16.0.0/12
 192.168.0.0/16
 
+{{ .Env.JMAIL_ORIGIN }}
 *.{{ .Env.JMAIL_ORIGIN }}
diff --git a/data/templates/postfix/generic.tmpl b/data/templates/postfix/generic.tmpl
@@ -1 +1,3 @@
+root@{{ .Env.JMAIL_ORIGIN }} noreply@{{ .Env.JMAIL_ORIGIN }}
 root@localhost noreply@{{ .Env.JMAIL_ORIGIN }}
+root@localhost.localdomain noreply@{{ .Env.JMAIL_ORIGIN }}
diff --git a/data/templates/postfix/main.cf.tmpl b/data/templates/postfix/main.cf.tmpl
@@ -6,7 +6,7 @@ allow_percent_hack = no
 
 myhostname = {{ .Env.JMAIL_HOSTNAME }}
 myorigin = {{ .Env.JMAIL_ORIGIN }}
-mydestination = localhost.local, localhost.localdomain, localhost
+mydestination = localhost.localdomain, localhost
 mynetworks = 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 127.0.0.0/8
 
 # Incoming
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		sendonly._domainkey.{{ .Env.JMAIL_ORIGIN }} {{ .Env.JMAIL_ORIGIN}}:sendonly:/etc/opendkim/keys/{{ .Env.JMAIL_ORIGIN }}/sendonly.private
		sendonly._domainkey.{{ .Env.JMAIL_ORIGIN }} {{ .Env.JMAIL_ORIGIN }}:sendonly:/etc/opendkim/keys/{{ .Env.JMAIL_ORIGIN }}/sendonly.private
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		*@{{ .Env.JMAIL_ORIGIN }} sendonly._domainkey.{{ .Env.JMAIL_ORIGIN }}
		@.{{ .Env.JMAIL_ORIGIN }} sendonly._domainkey.{{ .Env.JMAIL_ORIGIN }}