hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-19 14:31:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update the /etc/mail/Makefile "start" target code to match the new startup

Browse Source 
logic and added a new set of targets for controlling the MSP queue runner
(start-mspq, stop-mspq, and restart-mspq).

Reminded by: Mark Santcroos <marks@ripe.net>
MFC after:	1 week
This commit is contained in:
Gregory Neil Shapiro 2002-03-28 03:30:27 +00:00
parent 4bfef13db0
commit 278bc2896a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=93315
1 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
etc/mail/Makefile
View File

@ -11,11 +11,19 @@
# maps - Build the feature maps # maps - Build the feature maps
# aliases - Build the sendmail aliases # aliases - Build the sendmail aliases
# install - Install the .cf file as /etc/mail/sendmail.cf # install - Install the .cf file as /etc/mail/sendmail.cf
#
# For the MTA daemon:
# start - Start the sendmail daemon with the flags defined in # start - Start the sendmail daemon with the flags defined in
# /etc/defaults/rc.conf or /etc/rc.conf # /etc/defaults/rc.conf or /etc/rc.conf
# stop - Stop the sendmail daemon # stop - Stop the sendmail daemon
# restart - Restart the sendmail daemon # restart - Restart the sendmail daemon
# #
# For the MSP queue running daemon:
# start-mspq - Start the sendmail MSP queue running daemon with the
# flags defined in /etc/defaults/rc.conf or /etc/rc.conf
# stop-mspq - Stop the sendmail MSP queue running daemon
# restart-mspq - Restart the sendmail MSP queue running daemon
#
# Calling `make' will generate the updated versions when either the # Calling `make' will generate the updated versions when either the
# aliases or one of the map files were changed. # aliases or one of the map files were changed.
# #
@ -65,6 +73,7 @@ SENDMAIL_CF_DIR?= /usr/src/contrib/sendmail/cf
# The pid is used to stop and restart the running daemon. # The pid is used to stop and restart the running daemon.
# #
SENDMAIL_PIDFILE?= /var/run/sendmail.pid SENDMAIL_PIDFILE?= /var/run/sendmail.pid
SENDMAIL_MSPQ_PIDFILE?= /var/spool/clientmqueue/sm-client.pid
# #
# Some useful programs we need. # Some useful programs we need.
@ -164,15 +173,28 @@ install: ${INSTALL_CF}
.endif .endif
start: start:
(. /etc/defaults/rc.conf; source_rc_confs; \ @(. /etc/defaults/rc.conf; source_rc_confs; \
case "$${sendmail_enable}" in \ case "$${sendmail_enable}" in \
[Nn][Oo][Nn][Ee]) \
echo "ERROR: sendmail_enable is set to $${sendmail_enable}" \
;; \
[Yy][Ee][Ss]) \ [Yy][Ee][Ss]) \
/usr/sbin/sendmail $${sendmail_flags} \ ${SENDMAIL} $${sendmail_flags}; \
echo "${SENDMAIL} $${sendmail_flags}" \
;; \ ;; \
*) \ *) \
case "$${sendmail_outbound_enable}" in \ case "$${sendmail_submit_enable}" in \
[Yy][Ee][Ss]) \ [Yy][Ee][Ss]) \
/usr/sbin/sendmail $${sendmail_outbound_flags} \ ${SENDMAIL} $${sendmail_submit_flags}; \
echo "${SENDMAIL} $${sendmail_submit_flags}" \
;; \
*) \
case "$${sendmail_outbound_enable}" in \
[Yy][Ee][Ss]) \
${SENDMAIL} $${sendmail_outbound_flags}; \
echo "${SENDMAIL} $${sendmail_outbound_flags}" \
;; \
esac \
;; \ ;; \
esac \ esac \
;; \ ;; \
@ -185,6 +207,31 @@ stop:
restart: restart:
${KILL} -HUP `head -1 ${SENDMAIL_PIDFILE}` ${KILL} -HUP `head -1 ${SENDMAIL_PIDFILE}`
start-mspq:
@(. /etc/defaults/rc.conf; source_rc_confs; \
case "$${sendmail_enable}" in \
[Nn][Oo][Nn][Ee]) \
echo "ERROR: sendmail_enable is set to $${sendmail_enable}" \
;; \
*) \
if [ -r /etc/mail/submit.cf ]; then \
case "$${sendmail_msp_queue_enable}" in \
[Yy][Ee][Ss]) \
${SENDMAIL} $${sendmail_msp_queue_flags}; \
echo "${SENDMAIL} $${sendmail_msp_queue_flags}" \
;; \
esac \
fi \
;; \
esac \
)
stop-mspq:
${KILL} -TERM `head -1 ${SENDMAIL_MSPQ_PIDFILE}`
restart-mspq:
${KILL} -HUP `head -1 ${SENDMAIL_MSPQ_PIDFILE}`
# User defined targets # User defined targets
.if exists(Makefile.local) .if exists(Makefile.local)
.include "Makefile.local" .include "Makefile.local"