.drone.yml

@@ -0,0 +1,53 @@
+---
+kind: pipeline
+name: default
+
+steps:
+  - name: build and publish image
+    image: plugins/docker
+    settings:
+      repo: eumau/postfix
+      auto_tag: true
+      username:
+        from_secret: dockerhub_username
+      password:
+        from_secret: dockerhub_password
+    when:
+      branch:
+        - master
+
+---
+kind: pipeline
+name: pull_request
+
+steps:
+  - name: build image only
+    image: plugins/docker
+    settings:
+      repo: eumau/postfix
+      auto_tag: true
+      dry_run: true
+
+trigger:
+  event:
+    - pull_request
+
+---
+kind: pipeline
+name: tags
+
+steps:
+  - name: docker
+    image: plugins/docker
+    settings:
+      repo: eumau/postfix
+      username:
+        from_secret: dockerhub_username
+      password:
+        from_secret: dockerhub_password
+      tags:
+        - ${DRONE_TAG}
+
+trigger:
+  event:
+    - tag

.gitea/workflows/build.yml

@@ -1,38 +0,0 @@
-name: Build Docker images
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        repo:
-          - eumau/postfix
-        tag:
-          - "5"
-    steps:
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push image
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          tags: ${{ matrix.repo }}:${{ matrix.tag }}
-          platforms: linux/amd64,linux/arm64

Dockerfile

@@ -1,4 +1,4 @@
-FROM eumau/debian:bookworm-slim
+FROM eumau/debian:buster-slim
 LABEL maintainer "Mauro Torrez <mauro@mau.ro>"
 ARG DEBIAN_FRONTEND=noninteractive
 ENV LC_ALL C
@@ -25,8 +25,6 @@ ENV POSTSCREEN_DNSBL_THRESHOLD="3"
 ENV POSTSCREEN_DNSBL_WHITELIST_THRESHOLD="-1"
 ENV POSTSCREEN_ENABLE=no
 ENV POSTSCREEN_GREET_ACTION="enforce"
-ENV PROPAGATE_UNMATCHED_EXTENSIONS="canonical, virtual"
-ENV RECIPIENT_DELIMITER="+"
 ENV RELAYHOST=""
 ENV SMTP_FALLBACK_RELAY=""
 ENV SMTP_SASL_AUTH_ENABLE=""

confd/conf.d/setup_main.toml

@@ -1,6 +1,6 @@
 [template]
 src = "setup_main.tmpl"
-dest = "/start.d/99_main"
+dest = "/start.d/setup_main"
 mode = "0755"
 keys = [
 "/biff",
@@ -10,8 +10,6 @@ keys = [
 "/myhostname",
 "/mynetworks",
 "/mynetworks/style",
-"/propagate/unmatched/extensions",
-"/recipient/delimiter",
 "/smtp/tls/security/level",
 "/smtpd/client/restrictions",
 "/smtpd/data/restrictions",

confd/conf.d/setup_milter.toml

@@ -1,6 +1,6 @@
 [template]
 src = "setup_milter.tmpl"
-dest = "/start.d/10_milter"
+dest = "/start.d/setup_milter"
 mode = "0755"
 keys = [
 "/internal/mail/filter/classes",

confd/conf.d/setup_postscreen.toml

@@ -1,6 +1,6 @@
 [template]
 src = "setup_postscreen.tmpl"
-dest = "/start.d/89_postscreen"
+dest = "/start.d/setup_postscreen"
 mode = "0755"
 keys = [
 "/bogofilter/enable",

confd/conf.d/setup_relayhost.toml

@@ -1,6 +1,6 @@
 [template]
 src = "setup_relayhost.tmpl"
-dest = "/start.d/88_relayhost"
+dest = "/start.d/setup_relayhost"
 mode = "0755"
 keys = [
 "/relayhost",

confd/conf.d/setup_submission.toml

@@ -1,6 +1,6 @@
 [template]
 src = "setup_submission.tmpl"
-dest = "/start.d/11_submission"
+dest = "/start.d/setup_submission"
 mode = "0755"
 keys = [
 "/submission/enable",

confd/templates/setup_main.tmpl

@@ -40,8 +40,6 @@ postconf alias_maps=hash:/etc/aliases
 {{ with getv "/myhostname" }}postconf myhostname='{{.}}'{{ end }}
 {{ with getv "/mynetworks" }}postconf mynetworks='{{.}}'{{ end }}
 {{ with getv "/mynetworks/style" }}postconf mynetworks_style='{{.}}'{{ end }}
-{{ with getv "/propagate/unmatched/extensions" }}postconf propagate_unmatched_extensions='{{.}}'{{ end }}
-{{ with getv "/recipient/delimiter" }}postconf recipient_delimiter='{{.}}'{{ end }}
 {{ with getv "/smtp/tls/security/level" }}postconf smtp_tls_security_level='{{.}}'{{ end }}
 {{ with getv "/smtpd/client/restrictions" }}postconf smtpd_client_restrictions='{{.}}'{{ end }}
 {{ with getv "/smtpd/data/restrictions" }}postconf smtpd_data_restrictions='{{.}}'{{ end }}

postmap_all

@@ -13,4 +13,4 @@ postconf -h \
     virtual_mailbox_maps \
     | sed "s/,/\n/g" | sed "s/ /\n/g" | sort | uniq \
     | egrep '(hash):' \
-    | xargs -t -n1 postmap
+    | xargs -n1 postmap