Merge branch 'master' of gitea.hottis.de:wn/exim-docker

.woodpecker.yml

@@ -13,6 +13,12 @@ steps:
       dockerfile: Dockerfile
     when:
       - event: [push, tag]
+  scan_image:
+    image: aquasec/trivy
+    commands:
+      - trivy image $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA --quiet --exit-code 1
+    when:
+      - event: [push, tag]
   build:
     image: plugins/kaniko
     settings:

Dockerfile

@@ -12,7 +12,7 @@ ENV SMARTHOST_PASS=""
 # ip addresses or networks to allow for relaying, separate multiple ones by semicolon
 ENV RELAYNETS="127.0.0.1/32"
 
-RUN apk add --no-cache exim m4 openssl
+RUN apk add --no-cache exim m4
 
 COPY exim.conf.m4 /etc/exim
 COPY start.sh /etc/exim

examples/deploy.sh

@@ -8,7 +8,7 @@ kubectl create secret generic smtp-secrets \
   --from-literal=SMARTHOST="smtprelaypool.ispgateway.de" \
   --from-literal=SMARTHOST_USER="pseudosmarthostuser@hottis.de" \
   --from-literal=SMARTHOST_PASS="$SMARTHOST_PASSWORD" \
-  --from-literal=RELAYNETS=":10.0.0.0/8" | \
+  --from-literal=RELAY_NETWORKS=":10.0.0.0/8" | \
 kubectl apply -n system -f -
 
 kubectl apply -n system -f deploy.yml

examples/deploy.yml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: smtp
-          image: quay.io/wollud1969/exim-docker:0.2.2
+          image: quay.io/wollud1969/exim-docker:0.2.1
           envFrom:
             - secretRef:
                 name: smtp-secrets

exim.conf.m4

@@ -16,14 +16,15 @@ errprint(`Error: HOSTNAME not set')
 m4exit(1)
 ')
 
+
+dnl ----------------------------------------------------------------
 dnl template for exim.conf
 
 primary_hostname = HOSTNAME
 
 acl_smtp_rcpt = acl_check_rcpt
 
-tls_certificate = /etc/exim/tls.crt
-tls_privatekey = /etc/exim/tls.key
+tls_advertise_hosts =
 
 begin routers
 smarthost_route:

readme.md

@@ -54,3 +54,4 @@ docker network connect mailer-network name_of_other_container
 
 Now you can use the name of the mailer container, here `mailer` as smarthost name in that other container.
 
+

start.sh

@@ -1,9 +1,4 @@
 #!/bin/sh
 
-openssl genpkey -algorithm RSA -out tls.key && \
-openssl req -new -key tls.key -out tls.csr -subj "/C=DE/CN=$HOSTNAME" && \
-openssl x509 -req -in tls.csr -signkey tls.key -out tls.crt -days 3650 && \
-chown exim tls.key tls.crt && \
-m4 exim.conf.m4 > exim.conf && \
-exim -bd -q15m -v
+m4 exim.conf.m4 > exim.conf && exim -bd -q15m -v