From cd03d72e34ff9ae46e77af26e94b140a5287276c Mon Sep 17 00:00:00 2001 From: f Date: Fri, 27 Sep 2019 17:18:41 -0300 Subject: [PATCH 1/3] opendkim --- Dockerfile | 9 +++++++++ monit.conf | 3 +++ opendkim.sh | 8 ++++++++ 3 files changed, 20 insertions(+) create mode 100644 monit.conf create mode 100644 opendkim.sh diff --git a/Dockerfile b/Dockerfile index 59c5898..2c0ecf8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,11 @@ FROM sutty/monit:latest MAINTAINER "f " + +RUN apk add --no-cache opendkim +COPY ./monit.conf /etc/monit.d/opendkim.conf +COPY ./opendkim.sh /usr/local/bin/opendkim +RUN chmod 755 /usr/local/bin/opendkim +RUN install -dm 2750 -o opendkim -g opendkim /run/opendkim + +EXPOSE 8891 +VOLUME /etc/opendkim diff --git a/monit.conf b/monit.conf new file mode 100644 index 0000000..755b944 --- /dev/null +++ b/monit.conf @@ -0,0 +1,3 @@ +check process opendkim with pidfile /tmp/opendkim.pid + start program = "/usr/local/bin/opendkim start" + stop program = "/usr/local/bin/opendkim stop" diff --git a/opendkim.sh b/opendkim.sh new file mode 100644 index 0000000..2c0deb4 --- /dev/null +++ b/opendkim.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +pid=/tmp/opendkim.pid + +case $1 in + stop) cat ${pid} | xargs kill ;; + *) /usr/sbin/opendkim ;; +esac From dfcb68260d854a234d54dbba178fd991b3004011 Mon Sep 17 00:00:00 2001 From: f Date: Fri, 27 Sep 2019 17:20:33 -0300 Subject: [PATCH 2/3] recover ownership --- opendkim.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/opendkim.sh b/opendkim.sh index 2c0deb4..f106878 100644 --- a/opendkim.sh +++ b/opendkim.sh @@ -4,5 +4,7 @@ pid=/tmp/opendkim.pid case $1 in stop) cat ${pid} | xargs kill ;; - *) /usr/sbin/opendkim ;; + *) + chown -R opendkim:opendkim /etc/opendkim + /usr/sbin/opendkim ;; esac From 2d31d0143779235cb8248d49792e02bac7138bde Mon Sep 17 00:00:00 2001 From: f Date: Thu, 24 Sep 2020 09:23:56 -0300 Subject: [PATCH 3/3] send reports --- Dockerfile | 6 +++--- monit.conf | 4 ++-- opendkim.sh => opendkimd.sh | 0 sendmail.sh | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) rename opendkim.sh => opendkimd.sh (100%) mode change 100644 => 100755 create mode 100755 sendmail.sh diff --git a/Dockerfile b/Dockerfile index 2c0ecf8..dd20bb6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ FROM sutty/monit:latest MAINTAINER "f " -RUN apk add --no-cache opendkim +RUN apk add --no-cache opendkim mini-sendmail COPY ./monit.conf /etc/monit.d/opendkim.conf -COPY ./opendkim.sh /usr/local/bin/opendkim -RUN chmod 755 /usr/local/bin/opendkim +COPY ./opendkimd.sh /usr/local/bin/opendkimd +COPY ./sendmail.sh /usr/bin/sendmail RUN install -dm 2750 -o opendkim -g opendkim /run/opendkim EXPOSE 8891 diff --git a/monit.conf b/monit.conf index 755b944..320baf0 100644 --- a/monit.conf +++ b/monit.conf @@ -1,3 +1,3 @@ check process opendkim with pidfile /tmp/opendkim.pid - start program = "/usr/local/bin/opendkim start" - stop program = "/usr/local/bin/opendkim stop" + start program = "/usr/local/bin/opendkimd start" + stop program = "/usr/local/bin/opendkimd stop" diff --git a/opendkim.sh b/opendkimd.sh old mode 100644 new mode 100755 similarity index 100% rename from opendkim.sh rename to opendkimd.sh diff --git a/sendmail.sh b/sendmail.sh new file mode 100755 index 0000000..3ca4b69 --- /dev/null +++ b/sendmail.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +/var/lib/mini-sendmail/mini_sendmail -s postfix $@ + +exit $?