diff --git a/apps/k8s01/mail/mail-values.yaml b/apps/k8s01/mail/mail-values.yaml
index cef81ecbecc822608088ab8948424ed9678737ea..525d411039104ec5b3a48d96a3cb1bf176a3ed57 100644
--- a/apps/k8s01/mail/mail-values.yaml
+++ b/apps/k8s01/mail/mail-values.yaml
@@ -5,15 +5,15 @@ metadata:
namespace: mail
type: Opaque
stringData:
- values-overrides.yaml: ENC[AES256_GCM,data:ZybvE+13xtIGEGZzaFfMaGgiLiHR0KrBAN5IcSARNWGe6DFdz8ODRudZjUd6gf4CzsPASj/jlrmXNIflOPLJhSdTPQGcbg91kTQ6ecLKJJMn8hM3ORKsUrquLBqMkad254SYUazxAR/qm6pzRDNju9CkBoe8bh3BVnhpIYpjMwMGzP0oid47tuk2UfKiAwh++sjLeIaaWvz6p4AWY4QzXXRxGfXpwTlKMD01OWwsppQ6Zyhc7kdOVUmweeTU1Eo8mLXrxeC4ax6TSBCSK7t5TkHPmfqqJGKPVwahb65CFIWBAY/WNbmSNlMFm94SMtXYRUVwJ4DrIba6evHZeiFNwlh8V160umEZtsjKER/4tuVA7yw46fXfCSbKMNHpPOohq+NLszUxlAPic/V4zwHphulQp0NHKpzWB4FmtNT9+w8TrP6KWJVmUpsFTailTP8aqC+z491xsTtW8pcuLXrZtJkirVNny9hpzsRSOsqk/knGxvEJaXu+AulqwDlGEt94+yDtK7re66cN40lHRs7gf9ahKCeSQLGO5dYVgOo24GlRN/9pWgjAXakHnUsMvkQlcviuM5OBltEFdNXqed3zBx0z41eKddXVTwiLGkBVB0fUEoe/wHumVYYO4ye0p9HfqGtCar+loppyYMUOJVlNyxNkHUn0SZa3A08qpSRzIVA5eQCgh12oMG6DpUAMkHuhimMOLO15ELz8qOVk6zHNMOwk6tIhQKj3sM8ieZLDUr9yD5R8XxEYcIe/RVR7hpMYs8oKlLIAPgk/CaurkXnfWwC/GvDZyIHND0tGszX4BFE9/ZzfOeSi/mXPmbRycW7jBqxWx/aI1Vk//lDCZqNS2RX622ZqrGfvpIw9/fHnPCfNVBDKGu6wMyw41rnwMMMj23djRY9BFFmzh/1JQ4+n8mZzaAZR1gubOABWtsmIU8Xcnh9zVtpOjSA3AVOGdJSFFhI8ykLe8UaG0eGZCFxo0q/nvGa/KxVKb1/50oBzqyJB4y1AF5ToCIP3qcuNHEalFqV5fMFCvwj+xaaUVgswCZnb++sN4oNyZz4AAtDWke6otgmDxM3XLWSOXwINGhIeTqzgIRIax4PHhtk1YlTK45STtiQ2OOoVurrqFHPUhQyrJgVUEiPUWGprSM7QD93vduP2bjiFGQmMyXWQVVIEKXgNYnkPcUjmHcpBL1yeczDqGsjJbaGpIpADRXNZ3KQX95f9GbykF9HzU0wvF9kMXsPoRc4Oy+tSu8YjlenmHopSt4VYPVwBvz0s1oohSyTzYhrGz3JRjs+9sHyxY/zYSmIvcSnENiVW61t5dhzd082vhgNpccaI7j2woyfkvE9eg8zYM5aJ4lIcMup6S5p53XxKXyEf1K8HAd7GGOScIiemyoZUbtEB0QR3rqZgXuEc2Lq+rVSjbjOA6E7XX7yXjWd2OdJR499zl8RJS7gk2DSm4Mn+UT67qh1CCf/PP6H9,iv:nidgq+Bnt69l8xWz7SLakyahMqHWf58KyDIKg1Bjp8o=,tag:E4Utb3JP04BcTHYaGxj2iQ==,type:str]
+ values-overrides.yaml: ENC[AES256_GCM,data:IVvmvVFtREg8kM04aL+HmDtcj0F0iXTbnriOP3UIrh6r6xLChKf8rqperRsqI44KTj8i8Dz+y8c/KX6lI9fOyw1HcnNOhyLx2S3nuLFWrkTOauCLaoGMm32Enx4Yz84r+O4CZxkXeM42xk4dt5S9IjePtzXBVhZeV0nGPO60UDv2xBn+rFAmr5AJDYRoPi4VjDQSSSkItreQqYxVUpIO37MNPkmm7HoQkJOIb6vPixKT4FcK/GX4TrAfe4qo9mjsmecED73kG2thYWeCQ+2mte35nNDvZViR+Jg14s6OC7LnNiW/IxN3wX+rdipFbujRRL/cCpX+BeHAZ4vh99C2pKZqXRR0GHXu3diLA0oVyfX7reC9D6Ac4RByMKSSuQG3FSMAm3EXpL3WdsNZzSs1nbDkYkOw7PTFnmg/JQ1hsygSij6p9bgeNNQ2T/m6QUKIm6P9UFYIJtYTUsmojNu/XJSDXQLrbODsMWk+jyc+XnJTs5Ah0EF4mIzMlaOxZVCsx/oLXofpe46j2EMpwpREsiEnLkrPcMgpQ3b5MUt3YklcDy2aDMSp3sWeQwEVwB4v8wqNWJM4XpBse2lWva4ec2JGvGNVygJeGKUOpEUox654KzB3HBiNjfTix8V+bRw+/jeu6fwMHxX+GokrhcIzGYk2eevaOYr/p3+z93h9iWkz+4spaXjg2zKujnL8he3uGPFFpcoLW+BUzCKMYHu4AeLYCJqgbVPNnThBunFf/BxaqQvFkA6iuZqXhNDsv57xcai+udXQ/YGKNi++tns3a/tYTeVJ4l7DRlmfte+ubaP3/JKlsBfsSDyJ2sSIciA83GRjQdM5HIyJYw6oULWqugP2X9BthKS8/mvkPuqTIJik5r1QGzsFB0Ey+WLBseQ3d0tsqvYVZsP6btgyrlntxUhNL3lVCe5q3wa7SIkPnd8y+cAuqf8+K/pgFCeZp0XWWo024AE9WSHN8bVtSqFLEKhxpD6hXyYvBb85FtvlPPhvxbQCG4Jyo1x23+ebAEfFBgt9D44y502Kg7R9HZ8UMiGcvRMOtg8BPm+XWniWF5PjUSUplYdTacSfUbbPNr6xptRKf+Y3zmxmIV6v2zJEGqm1PRmRpW0gfDvIHqQJHPmRBDWbBhEPeauLWMO3IQjrRw014s8JjmLw6mJkf9aCpm+MEvOBLYJe7SB1X5psnVWhCtZtWfTLoTF4n7IhywLPggwvBcVnqWoZC6/Gzy7ytebcmCFhwKU4fOPv14jxukr7IWIeBZswTL6xxqstEfLHIbxuE/p9IEfYgsdwla4bzURZN8FGutnvvGvr6jWMDjrEEBuL67PGty1Jaovk0trHnOLWAHQkayhnLs9xdNMuO9GVY2yFlEnq+/XvtOz1yjmR5T0KxXTtb0Ah22Hc/UmqeQndEdeGWwQ0YyRuVVyDqmS0goOBe5TckHtex8YO59qVn3UIkQvzuzRGP79WEWHGW5Xi0C9I36AdctFi7a9WKzGaHVVu5z3+1s7sOybbyFxW4IMxBbZPCg==,iv:OTsRx+VNdUvHB5PNEGxi9alGte+h6AMYY4cioKmDPqs=,tag:gW6RxwhBCoL2Q/IvqvVSaw==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-07-14T21:36:07Z"
- mac: ENC[AES256_GCM,data:CaojqkN9aVSprfxR/8Rz2GdvMAdX1UkELhk8nXmHcfV56a7CV5JEydOcVrFC3XcGYvDJjvM/HEtZroDA79kDIAhuBkNZPxAVAmrHEIhC/RWL9TUqgfN0fwcYOL8iiWLw/DgNJtlQO344NeXqP2QyzKOZHI+elAqHhka8gete6n4=,iv:MdjQXacof+FUPNcV7A5IOwZhEBrMPz44Rq2Bf97twFQ=,tag:lfxQgza75VlrvD1dqtaOqQ==,type:str]
+ lastmodified: "2022-09-25T17:41:28Z"
+ mac: ENC[AES256_GCM,data:h1PsSEZIug+axRbrmPzoI8Py0e+Z8Z+aleVWy61wgV78jRSxeL8jkEQ8NenMByYp/jWTazvz/VaAdBL/Cl51D3AaWF1GxKHFxRJHTZF+zIeBrGKCRh/MiWgJ+gJOE3T0Nwpa3ChxU5CcHv+c87UPzWp059kMouAAgljVt+ytXWU=,iv:nn9w9pjqYucvVsKTsSh+mwL4z+GXCuSEe+/0BzVgoGA=,tag:a4OHF4HPyxYZP2CQaPE9Rw==,type:str]
pgp:
- created_at: "2022-04-19T15:47:33Z"
enc: |-
diff --git a/charts/mok/Chart.yaml b/charts/mok/Chart.yaml
index 94bf2a5204a70ac1b7c6b23abf99703ac602c295..a2f16aa8c47f617f0784c92576582221ef179dc1 100644
--- a/charts/mok/Chart.yaml
+++ b/charts/mok/Chart.yaml
@@ -3,7 +3,7 @@ name: mok
description: |
Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret.
type: application
-version: 0.5.2
+version: 0.6.1
sources:
- https://de.postfix.org/ftpmirror/index.html
- https://github.com/dovecot/core
diff --git a/charts/mok/README.md b/charts/mok/README.md
index 69a685b3cfbc27f04c8cae84463a42e1d947f0e5..c4db6d7c61993d047bd2fa806179c430304323d9 100644
--- a/charts/mok/README.md
+++ b/charts/mok/README.md
@@ -1,6 +1,6 @@
# mok
- 
+ 
Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret.
@@ -53,9 +53,10 @@ Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that run
| nameOverride | string | `""` | |
| networkPolicy.create | bool | `true` | Create NetworkPolicies to access the mailserver from outside |
| postfix.affinity | object | `{}` | |
+| postfix.hostname | string | `nil` | explicitly set postfix hostname |
| postfix.image.pullPolicy | string | `"IfNotPresent"` | |
| postfix.image.repository | string | `"quay.io/shivering-isles/postfix"` | postfix container image |
-| postfix.image.tag | string | `"0.2.3"` | Overrides the image tag whose default is "latest" |
+| postfix.image.tag | string | `"0.3.0"` | Overrides the image tag whose default is "latest" |
| postfix.imagePullSecrets | list | `[]` | |
| postfix.nodeSelector | object | `{}` | |
| postfix.podAnnotations | object | `{}` | |
diff --git a/charts/mok/templates/postfix.yaml b/charts/mok/templates/postfix.yaml
index 6a3e32405d98a6ab9aff4bb9cbb901fef0c70335..ab3b7ae5b70d1910f9304e8ee62a7f4e182af847 100644
--- a/charts/mok/templates/postfix.yaml
+++ b/charts/mok/templates/postfix.yaml
@@ -75,6 +75,10 @@ spec:
env:
- name: DOVECOT_SERVICE_NAME
value: {{ include "mok.fullname" . }}-dovecot-internal.{{ .Release.Namespace }}.svc.cluster.local
+ {{- if .Values.postfix.hostname }}
+ - name: HOSTNAME
+ value: {{ .Values.postfix.hostname }}
+ {{- end }}
image: {{ .Values.postfix.image.repository }}:{{.Values.postfix.image.tag | default "latest" }}
imagePullPolicy: {{ .Values.postfix.image.pullPolicy }}
lifecycle:
diff --git a/charts/mok/values.yaml b/charts/mok/values.yaml
index 816aa2e3b5d85cec0c54784692852b34ad0a0380..d7fdd632bff76dc57d29d60c314ded7f906425cb 100644
--- a/charts/mok/values.yaml
+++ b/charts/mok/values.yaml
@@ -36,6 +36,8 @@ relay:
postfix:
+ # -- explicitly set postfix hostname
+ hostname: null
# -- Number of postfix pods.
replicaCount: 1
@@ -44,7 +46,7 @@ postfix:
repository: quay.io/shivering-isles/postfix
pullPolicy: IfNotPresent
# -- Overrides the image tag whose default is "latest"
- tag: "0.2.3"
+ tag: "0.3.0"
imagePullSecrets: []
diff --git a/images/postfix/.release b/images/postfix/.release
index 5bf903b79e9b4a501e8e540d4a851a9b3b0322bf..7f1bdeb40c1300cd15edddfa5b46c9499bac4319 100644
--- a/images/postfix/.release
+++ b/images/postfix/.release
@@ -1 +1 @@
-release=0.2.3
+release=0.3.0
diff --git a/images/postfix/config/main.cf b/images/postfix/config/main.cf
index db10641a7f6824015d630021ccaafe43ee0655b5..11281de1a6ff2b5572ffffe32d81ede4972205e9 100644
--- a/images/postfix/config/main.cf
+++ b/images/postfix/config/main.cf
@@ -89,21 +89,16 @@ virtual_transport = lmtp:inet:dovecot-internal:24
postscreen_access_list = permit_mynetworks
postscreen_blacklist_action = drop
-postscreen_greet_action = enforce
+postscreen_greet_action = ignore
postscreen_dnsbl_action = enforce
postscreen_dnsbl_threshold = 3
-postscreen_dnsbl_whitelist_threshold = -1
+postscreen_dnsbl_allowlist_threshold = -1
postscreen_dnsbl_sites =
zen.spamhaus.org*3,
ix.dnsbl.manitu.net*3,
- multi.uribl.com,
bl.spamcop.net,
b.barracudacentral.org,
- dnsbl-1.uceprotect.net,
safe.dnsbl.sorbs.net,
- ubl.unsubscore.com,
- psbl.surriel.com,
- dnsbl.inps.de,
swl.spamhaus.org*-10,
########
@@ -122,18 +117,17 @@ smtpd_recipient_restrictions =
reject_unknown_sender_domain,
reject_unknown_recipient_domain,
reject_invalid_hostname,
- warn_if_reject reject_unauth_pipelining,
- permit_sasl_authenticated,
+ warn_if_reject reject_unauth_pipelining,
permit_mynetworks,
- reject_unverified_recipient,
+ reject_unverified_recipient,
reject_unauth_destination,
permit
smtpd_sender_restrictions =
- permit_mynetworks,
- reject_non_fqdn_sender,
- reject_authenticated_sender_login_mismatch,
- permit_sasl_authenticated
+ permit_mynetworks,
+ reject_non_fqdn_sender,
+ reject_authenticated_sender_login_mismatch,
+ permit_sasl_authenticated
#smtpd_restriction_classes = local_only
#local_only =