Merge remote-tracking branch 'origin/master' into unittests

# Conflicts:
#	charts/docker-mailserver/Chart.yaml

Author: MichaelSp

CONTRIBUTING.md

@@ -4,7 +4,7 @@ First off, thank you for helping to improve this chart! :heart_eyes: :pray:
 
 ## Testing
 
-To test the chart locally, before submitting changes, run `./ci/scripts/local-ci.sh`
+To test the chart locally, before submitting changes, run `./.ci/scripts/local-ct-lint.sh`
 
 ## Submitting changes
 

charts/docker-mailserver/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "13.3.1"
+appVersion: "14.0.0"
 description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
 name: docker-mailserver
-version: 3.0.14
+version: 4.0.6
 sources:
 - https://github.com/docker-mailserver/docker-mailserver-helm
 maintainers:

charts/docker-mailserver/README.md

@@ -1,4 +1,4 @@
-# docker-mailserver Heml Chart
+# docker-mailserver Helm Chart
 
 ## Contents
 

charts/docker-mailserver/templates/deployment.yaml

@@ -27,6 +27,9 @@ spec:
       labels:
         app.kubernetes.io/name: {{ template "dockermailserver.fullname" . }}
         release: "{{ .Release.Name }}"
+        {{- if .Values.deployment.labels }}
+{{ toYaml .Values.deployment.labels | indent 8 }}
+        {{ end }}
         {{- if .Values.deployment.annotations }}
       annotations:
 {{ toYaml .Values.deployment.annotations | indent 8 }}
@@ -80,6 +83,18 @@ spec:
       {{- end }}
     {{- end }}
 
+        # Extra volumes
+      {{- with .Values.deployment.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+
+      {{- if .Values.deployment.initContainers }}
+      initContainers:
+        {{- with .Values.deployment.initContainers }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- end }}
+
       containers:
         - name: docker-mailserver
           image: {{ .Values.image.name }}:{{ default .Chart.AppVersion .Values.image.tag }}
@@ -147,6 +162,11 @@ spec:
           {{- end }}
         {{- end }}
 
+            # Mount Extra Volumes
+          {{- with $.Values.deployment.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+
           livenessProbe:
             exec:
                command:
@@ -174,6 +194,8 @@ spec:
             - name: submission
               containerPort: 587
           {{- if .Values.proxyProtocol.enabled }}
+            - name: smtp-proxy
+              containerPort: 12525
             - name: subs-proxy
               containerPort: 10465
             - name: sub-proxy
@@ -244,4 +266,4 @@ spec:
               readonly: true
           {{- end }}
         {{- end }}
-{{- end }}
+{{- end }}

charts/docker-mailserver/templates/service.yaml

@@ -11,17 +11,17 @@ metadata:
     prometheus.io/path: {{ .Values.monitoring.service.path | quote }}
     prometheus.io/port: {{ .Values.monitoring.service.port | quote }}
     ##  
-  {{- if .Values.service.annotations }}
-  {{ toYaml .Values.service.annotations | indent 2 }}  
-  {{ end }}    
+{{- if .Values.service.annotations }}
+{{ toYaml .Values.service.annotations | indent 4 }}
+{{ end }}
   labels:
     app.kubernetes.io/name: {{ template "dockermailserver.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
-  {{- if .Values.service.labels }}
-  {{ toYaml .Values.service.labels | indent 2 }}  
-  {{ end }} 
+{{- if .Values.service.labels }}
+{{ toYaml .Values.service.labels | indent 4 }}
+{{ end }}
   name: {{ template "dockermailserver.fullname" . }}
 spec:
   ## If a load balancer is being used, ensure that the newer type of LB that passes along IP information is used
@@ -55,6 +55,9 @@ spec:
       nodePort: {{ default "30587" .Values.service.nodePort.submission }}
       {{ end }}
   {{- if .Values.proxyProtocol.enabled }}
+    - name: smtp-proxy
+      targetPort: smtp-proxy
+      port: 12525
     - name: subs-proxy
       targetPort: subs-proxy
       port: 10465

charts/docker-mailserver/values.yaml

@@ -77,7 +77,6 @@ deployment:
     # -----------------------------------------------
     LOG_LEVEL: info
     SUPERVISOR_LOGLEVEL: 
-    ONE_DIR: 1
     DMS_VMAIL_UID: 
     DMS_VMAIL_GID: 
     ACCOUNT_PROVISIONER: 
@@ -103,6 +102,7 @@ deployment:
     RSPAMD_GREYLISTING: 0
     RSPAMD_HFILTER: 1
     RSPAMD_HFILTER_HOSTNAME_UNKNOWN_SCORE: 6
+    RSPAMD_NEURAL: 0
     ENABLE_AMAVIS: 0
     AMAVIS_LOGLEVEL: 0
     ENABLE_DNSBL: 0
@@ -131,6 +131,7 @@ deployment:
     LOGWATCH_SENDER: 
     REPORT_RECIPIENT: 
     REPORT_SENDER: 
+    LOGROTATE_COUNT: 4
     LOGROTATE_INTERVAL: weekly
     POSTFIX_REJECT_UNKNOWN_CLIENT_HOSTNAME: 0
     POSTFIX_INET_PROTOCOLS: all
@@ -147,7 +148,7 @@ deployment:
     SA_TAG: 2.0
     SA_TAG2: 6.31
     SA_KILL: 10.0
-    SA_SPAM_SUBJECT: '***SPAM*** '
+    SPAM_SUBJECT: '***SPAM*** '
 
     # -----------------------------------------------
     # --- Fetchmail Section -------------------------
@@ -271,6 +272,27 @@ deployment:
   ## Optionally specify tolerations for the deployment
   tolerations: []
 
+  ## Optionally specify initContainers
+  initContainers: []
+  #  - name: init
+  #    image: alpine:3
+  #    command: [sh, -c]
+  #    args:
+  #      - echo "Hello, world!" > /mnt/extra-storage/test
+  #    volumeMounts:
+  #      - name: extra-storage
+  #        mountPath: /mnt/extra-storage
+
+  ## Optionally specify a list of extra mounts to add (normally used with extraVolumes)
+  extraVolumeMounts: []
+  #  - name: extra-storage
+  #    mountPath: /mnt/extra-storage
+
+  ## Optionally specify a list of extra volumes to add
+  extraVolumes: []
+  #  - name: extra-storage
+  #    emptyDir: {}
+
 service:
   ## What scope the service should be exposed in. One of:
   ## - LoadBalancer (to the world)
@@ -576,22 +598,30 @@ configMaps:
         -o milter_macro_daemon_name=ORIGINATING
         -o cleanup_service_name=sender-cleanup
         -o smtpd_upstream_proxy_protocol=haproxy
+
+      # Smtp with proxy
+      12525     inet  n       -       n       -       1       postscreen
+        -o syslog_name=postfix/smtp-proxy
+        -o postscreen_upstream_proxy_protocol=haproxy
+        -o postscreen_cache_map=btree:$data_directory/postscreen_10025_cache
       EOS
       {{- end }}
 
 ## The secrets key works the same way as the configs key. Use secrets to store sensitive information,
 ## such as DKIM signing keys.
 ##
 ##  secrets:
-##  - name: rspamd.example.com                      # This is the name of the Secret
-##    create: true                                  # If true, create a new Secret
-##    path: rspamd.dkim.rsa-2048-mail-example.com.private.txt
-##    data: abace                           # If create is true, then you must specify content. Must be base 64 encoded!
+##    rspamd.example.com:
+##      name: rspamd.example.com                      # This is the name of the Secret
+##      create: true                                  # If true, create a new Secret
+##      path: rspamd.dkim.rsa-2048-mail-example.com.private.txt
+##      data: abace                           # If create is true, then you must specify content. Must be base 64 encoded!
 ##
-##  - name: rspamd.dkim.rsa-2048-mail-example.com.public
-##    create: true
-##    path: rspamd/dkim/rsa-2048-mail-example.com.public
-##    data: abace                           # If create is true, then you must specify content. Must be base 64 encoded!
+##    rspamd.dkim.rsa-2048-mail-example.com.public:
+##      name: rspamd.dkim.rsa-2048-mail-example.com.public
+##      create: true
+##      path: rspamd/dkim/rsa-2048-mail-example.com.public
+##      data: abace                           # If create is true, then you must specify content. Must be base 64 encoded!
 ##
 ##  If you set the create key to false, then you must manually create the ConfigMaps before deploying the chart.
 ##