rpms/sendmail
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed systemctl disable command in preun section

Browse Source 
Replaced reload by restart, dropped ExecReload from sendmail.service
Resolves: rhbz#719931
Switched to systemctl in NetworkManager dispatcher script
Added ExecStartPre=-/etc/mail/make to sm-client.service
Hardcoded daemon option (-bd) to sendmail.service, dropped the DAEMON var
QUEUE var in /etc/sysconfig/sendmail replaced by SENDMAIL_OPTS var
Added default preset (-q1h) to SENDMAIL_OPTS var
This commit is contained in:
Jaroslav Škarvada 2011-07-25 16:16:30 +02:00
parent 6ae4af377b
commit a25ef5c937
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sendmail.nm-dispatcher
View File

@ -2,6 +2,6 @@
case "$2" in case "$2" in
up|down|vpn-up|vpn-down) up|down|vpn-up|vpn-down)
/sbin/service sendmail reload || : /bin/systemctl restart sendmail.service || :
;; ;;
esac esac

5
sendmail.service
View File

@ -7,12 +7,11 @@ Wants=sm-client.service
[Service] [Service]
Type=forking Type=forking
PIDFile=/run/sendmail.pid PIDFile=/run/sendmail.pid
Environment=SENDMAIL_OPTS=-q1h
EnvironmentFile=-/etc/sysconfig/sendmail EnvironmentFile=-/etc/sysconfig/sendmail
ExecStartPre=-/etc/mail/make ExecStartPre=-/etc/mail/make
ExecStartPre=-/etc/mail/make aliases ExecStartPre=-/etc/mail/make aliases
ExecStart=/usr/sbin/sendmail $DAEMON $QUEUE $SENDMAIL_OPTARG ExecStart=/usr/sbin/sendmail -bd $SENDMAIL_OPTS $SENDMAIL_OPTARG
ExecReload=-/etc/mail/make
ExecReload=-/etc/mail/make aliases
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

16
sendmail.spec
View File

@ -14,7 +14,7 @@
Summary: A widely used Mail Transport Agent (MTA) Summary: A widely used Mail Transport Agent (MTA)
Name: sendmail Name: sendmail
Version: 8.14.5 Version: 8.14.5
Release: 5%{?dist} Release: 6%{?dist}
License: Sendmail License: Sendmail
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.sendmail.org/ URL: http://www.sendmail.org/
@ -531,9 +531,9 @@ exit 0
%preun %preun
if [ $1 = 0 ]; then if [ $1 = 0 ]; then
/bin/systemctl --no-reload sendmail.service > /dev/null 2>&1 || : /bin/systemctl --no-reload disable sendmail.service > /dev/null 2>&1 || :
/bin/systemctl stop sendmail.service > /dev/null 2>&1 || : /bin/systemctl stop sendmail.service > /dev/null 2>&1 || :
/bin/systemctl --no-reload sm-client.service > /dev/null 2>&1 || : /bin/systemctl --no-reload disable sm-client.service > /dev/null 2>&1 || :
/bin/systemctl stop sm-client.service > /dev/null 2>&1 || : /bin/systemctl stop sm-client.service > /dev/null 2>&1 || :
%{_sbindir}/alternatives --remove mta %{_sbindir}/sendmail.sendmail %{_sbindir}/alternatives --remove mta %{_sbindir}/sendmail.sendmail
fi fi
@ -676,6 +676,16 @@ exit 0
%changelog %changelog
* Mon Jul 25 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.5-6
- Fixed systemctl disable command in preun section
- Replaced reload by restart, dropped ExecReload from sendmail.service
Resolves: rhbz#719931
- Switched to systemctl in NetworkManager dispatcher script
- Added ExecStartPre=-/etc/mail/make to sm-client.service
- Hardcoded daemon option (-bd) to sendmail.service, dropped the DAEMON var
- QUEUE var in /etc/sysconfig/sendmail replaced by SENDMAIL_OPTS var
- Added default preset (-q1h) to SENDMAIL_OPTS var
* Fri Jul 22 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.5-5 * Fri Jul 22 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.5-5
- Fixed SMTP AUTH over TLS in case of two AUTH lines - Fixed SMTP AUTH over TLS in case of two AUTH lines
Resolves: rhbz#716628 Resolves: rhbz#716628

3
sendmail.sysconfig
View File

@ -1,2 +1 @@
DAEMON="-bd" SENDMAIL_OPTS="-q1h"
QUEUE="-q1h"

4
sm-client.service
View File

@ -6,11 +6,13 @@ Wants=sendmail.service
[Service] [Service]
Type=forking Type=forking
PIDFile=/run/sm-client.pid PIDFile=/run/sm-client.pid
Environment=SENDMAIL_OPTS=-q1h
EnvironmentFile=-/etc/sysconfig/sendmail EnvironmentFile=-/etc/sysconfig/sendmail
ExecStartPre=/bin/touch /run/sm-client.pid ExecStartPre=/bin/touch /run/sm-client.pid
ExecStartPre=/bin/chown smmsp:smmsp /run/sm-client.pid ExecStartPre=/bin/chown smmsp:smmsp /run/sm-client.pid
ExecStartPre=-/sbin/restorecon /run/sm-client.pid ExecStartPre=-/sbin/restorecon /run/sm-client.pid
ExecStart=/usr/sbin/sendmail -L sm-msp-queue -Ac $QUEUE $SENDMAIL_OPTARG ExecStartPre=-/etc/mail/make
ExecStart=/usr/sbin/sendmail -L sm-msp-queue -Ac $SENDMAIL_OPTS $SENDMAIL_OPTARG
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target