summaryrefslogtreecommitdiffstats
path: root/etc/defaults
diff options
context:
space:
mode:
authorgshapiro <gshapiro@FreeBSD.org>2002-04-10 03:58:40 +0000
committergshapiro <gshapiro@FreeBSD.org>2002-04-10 03:58:40 +0000
commitcb7ff33241638dbb7ac824a2d4a5c93a12dbe544 (patch)
tree6b0b75b209484d5e56e8742e678efecb40c834f9 /etc/defaults
parentb489d476e4aa41964680332b8f09df0b26a49278 (diff)
downloadFreeBSD-src-cb7ff33241638dbb7ac824a2d4a5c93a12dbe544.zip
FreeBSD-src-cb7ff33241638dbb7ac824a2d4a5c93a12dbe544.tar.gz
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. MFC after: 1 week
Diffstat (limited to 'etc/defaults')
-rw-r--r--etc/defaults/periodic.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 19c25dc..295a22b 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -102,6 +102,7 @@ daily_status_rwho_enable="YES" # Check system status
# 440.status-mailq
daily_status_mailq_enable="YES" # Check mail status
daily_status_mailq_shorten="NO" # Shorten output
+daily_status_include_submit_mailq="YES" # Also submit queue
# 450.status-security
daily_status_security_enable="YES" # Security check
@@ -117,6 +118,7 @@ daily_status_named_usedns="YES" # DNS lookups are ok
# 500.queuerun
daily_queuerun_enable="YES" # Run mail queue
+daily_submit_queuerun="YES" # Also submit queue
# 999.local
daily_local="/etc/daily.local" # Local scripts
OpenPOWER on IntegriCloud