From nobody Fri Feb 25 11:46:34 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 10DC819CAFF2; Fri, 25 Feb 2022 11:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K4nzt6Rhmz3J1s; Fri, 25 Feb 2022 11:46:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645789595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qEfDRNjkvSHAvHVGyMGsZOQ2xI31oFLeK3vwW1rBl0A=; b=KfBi9cYijhX4q/O2yvSp+xwrIeC+Ag5cadVlMNN4NhQhlnnAqkVSSu2Tfw37g7Xs9g6rmb ERaeVUBwxzTUFBjIl1o5zS132GrBTD2BPHDIpI1qNmkiyYkefk9X42H0C5CoX1hdxsCEOD /FRmrJycdb0LS+3BoDay2Ws1EaXyzl7Mmr00lGvxJyeXonVodas69lf8LlcxpMU/9Y55jJ sGdZlI/D/sgh6+2vOlB9RGpO8Z7CnIsHBk5WJILKkaxhSgMTqlbNuCLHyhD+FbIiYj6mlo Th0tLYtuDkt/VN/taLDJV9JebxW4CMkiTFjNRcyL4/z9OchiSV8oFVyvt5rU2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD6091F384; Fri, 25 Feb 2022 11:46:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21PBkY9N069629; Fri, 25 Feb 2022 11:46:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21PBkYaE069628; Fri, 25 Feb 2022 11:46:34 GMT (envelope-from git) Date: Fri, 25 Feb 2022 11:46:34 GMT Message-Id: <202202251146.21PBkYaE069628@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: f3c2313c5893 - main - mail/dma: Implement cronjob to flush emails List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3c2313c5893bd9d17216ace83e131f0dfa8a660 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645789595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qEfDRNjkvSHAvHVGyMGsZOQ2xI31oFLeK3vwW1rBl0A=; b=M/ZIljnKLuLm7W6DYRwv+nCnAlkLPnhhH3MmizV0txZgUvNamWyf/lkFdBsyF8VdYOZTLH YvFMN9lphDXqMvCCbCZoGQkTyhNTHuCA9GzO0PXSYC426dsYaZvG7+UwLZKw0hKmqqm0di syFg0wUGi5RuAL2CWgWcF7z4vH6ZGPVRkkAt3992zxnvUBqfwUwul3m9Z2DiDgMdvRA0KH LfebxCWygRR0fsbHBJIv6pc4qG0N/SYJ6yx+mOSxH+pECs9kwbWnAs2tUnsoKSB5cf6K5F j/ZhWpolfrcXGQBRtTDzXgcI2OkrwRml2286wy7H+ujW9ukpoST2inTdpt58GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645789595; a=rsa-sha256; cv=none; b=FiN6gMcCuKenrTxDtbs63AsMI0OolsDm1NoXVHMYX0paEL5bUF3JTXlF7C+VCrCix5yIU9 Fe+C71vR13p7605bELc0KffeZFbefV9/ZKgmss+ECyrrWYX8/8V+XCA0sz3M0ZRlS9aeQu KUfw8G0/zrD/ChaeO9vFtQzKkhufmEVOPMFqc0EY+OEGAY0eNmunD/UeDymsEkMprLyWWH qSFmn0eNIsnvAChQCKg0qh30Ur5eZT1EmTyEqmNZZ/Svl7OLFwaH2twfoEjclBx/gHtF87 ZyMzTySMzhy4bFhyM8Tr/q+HajCJHzHij6+AU/ERwg/gOUX38LInn0MX7TuQ6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3c2313c5893bd9d17216ace83e131f0dfa8a660 commit f3c2313c5893bd9d17216ace83e131f0dfa8a660 Author: Ronald Klop AuthorDate: 2022-02-25 11:42:26 +0000 Commit: Renato Botelho CommitDate: 2022-02-25 11:42:26 +0000 mail/dma: Implement cronjob to flush emails Add a new cronjob to flush emails every 30 minutes and change pkg-message to let users know about it. PR: 261532 Sponsored by: Rubicon Communications, LLC ("Netgate") --- mail/dma/Makefile | 6 ++++-- mail/dma/files/dma_cron.in | 5 +++++ mail/dma/files/pkg-message.in | 6 ++---- mail/dma/pkg-plist | 1 + 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mail/dma/Makefile b/mail/dma/Makefile index cb5d91e5942c..9a497a47bb0c 100644 --- a/mail/dma/Makefile +++ b/mail/dma/Makefile @@ -28,7 +28,7 @@ CFLAGS+= -DCONF_PATH='\"${PREFIX}/etc/dma\"' -DDMA_GROUP='\"mail\"' \ LDFLAGS+= -L${OPENSSLLIB} PORTSCOUT= limit:^[0-9\.]*$$ -SUB_FILES= pkg-message +SUB_FILES= dma_cron pkg-message BUILD_WRKSRC= ${WRKSRC}/bsd INSTALL_WRKSRC= ${WRKSRC}/bsd @@ -43,11 +43,13 @@ post-patch: ${WRKSRC}/bsd/dma-mbox-create/Makefile post-install: - ${MKDIR} ${STAGEDIR}${ETCDIR} + ${MKDIR} ${STAGEDIR}${ETCDIR}/cron.d ${MKDIR} ${STAGEDIR}/var/spool/dma ${INSTALL_DATA} ${WRKSRC}/dma.conf \ ${STAGEDIR}${ETCDIR}/dma.conf.sample ${INSTALL_DATA} ${WRKSRC}/auth.conf \ ${STAGEDIR}${ETCDIR}/auth.conf.sample + ${INSTALL_DATA} ${WRKDIR}/dma_cron \ + ${STAGEDIR}${ETCDIR}/cron.d/dma .include diff --git a/mail/dma/files/dma_cron.in b/mail/dma/files/dma_cron.in new file mode 100644 index 000000000000..43516fc904d8 --- /dev/null +++ b/mail/dma/files/dma_cron.in @@ -0,0 +1,5 @@ +SHELL=/bin/sh +PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin + +# See crontab(5) for field format. +*/30 * * * * root %%PREFIX%%/libexec/dma -q diff --git a/mail/dma/files/pkg-message.in b/mail/dma/files/pkg-message.in index fcc59f37b315..56989bd39f2b 100644 --- a/mail/dma/files/pkg-message.in +++ b/mail/dma/files/pkg-message.in @@ -33,10 +33,8 @@ shutdown, add the following to rc.conf as well: dma_flushq_enable="YES" -you can also add a cronjob to do regular mailq flushes using the following -command: - -%%PREFIX%%/libexec/dma -q +A crontab configuration to flush every 30 minutes was added to +%%PREFIX%%/etc/cron.d/dma. And you can disable some sendmail specific daily maintenance routines in your /etc/periodic.conf file: diff --git a/mail/dma/pkg-plist b/mail/dma/pkg-plist index 2e01fb01bc70..0f3dd105a0c8 100644 --- a/mail/dma/pkg-plist +++ b/mail/dma/pkg-plist @@ -1,3 +1,4 @@ +%%ETCDIR%%/cron.d/dma @(root,mail,2555) libexec/dma @(root,mail,4554) libexec/dma-mbox-create @sample(root,mail,0644) etc/dma/dma.conf.sample