From owner-cvs-all Sun Apr 14 18:56:21 2002 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6CF3937B404; Sun, 14 Apr 2002 18:56:15 -0700 (PDT) Received: (from gshapiro@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3F1uFq60156; Sun, 14 Apr 2002 18:56:15 -0700 (PDT) (envelope-from gshapiro) Message-Id: <200204150156.g3F1uFq60156@freefall.freebsd.org> From: Gregory Neil Shapiro Date: Sun, 14 Apr 2002 18:56:15 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/etc/defaults periodic.conf src/etc/periodic/daily 440.status-mailq 500.queuerun X-FreeBSD-CVS-Branch: RELENG_4 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG gshapiro 2002/04/14 18:56:15 PDT Modified files: (Branch: RELENG_4) etc/defaults periodic.conf etc/periodic/daily 440.status-mailq 500.queuerun Log: Forced commit to include reason for previous commit's changes since my periodic script changes were MFCed behind my back before the week in my original 'MFC after' commit time had passed. MFC: Update mail queue related periodic scripts to account for sendmail 8.12's clientmqueue (submit mail queue). The new mailq display is only active if both the old daily_status_mailq_enable is set to "YES" and the new daily_status_include_submit_mailq is set to "YES" so people who disabled 440.status-mailq won't have any surprises. Likewise, the new queue run is only active if both the old daily_queuerun_enable is set to "YES" and the new daily_submit_queuerun is set to "YES" so people who disabled 500.queuerun won't have any surprises. While I am here, remove the [ ! -d /var/spool/mqueue ] checks from both scripts as the queue directory isn't always /var/spool/mqueue for the main daemon -- it can be set to anything in the sendmail.cf file. Revision Changes Path 1.19 +3 -1 src/etc/defaults/periodic.conf 1.7 +24 -7 src/etc/periodic/daily/440.status-mailq 1.2 +8 -6 src/etc/periodic/daily/500.queuerun Revision Changes Path 1.7.2.11 +1 -1 src/etc/defaults/periodic.conf 1.4.2.4 +1 -1 src/etc/periodic/daily/440.status-mailq 1.1.2.3 +1 -1 src/etc/periodic/daily/500.queuerun To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message