Removed dots from description (there are no dots in systemd packaging
guidelines) Changed service type to forking and explicitly specified PID files Fixed creation of sm-client.pid Added Wants to sm-client.service and sendmail.service Replaced each occurrence of /var/run by /run in config files More details are available in rhbz#697636
This commit is contained in:
parent
fb3e4b9e3a
commit
80a10db498
@ -12,7 +12,7 @@
|
|||||||
define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
|
define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
|
||||||
define(`confTIME_ZONE', `USE_TZ')dnl
|
define(`confTIME_ZONE', `USE_TZ')dnl
|
||||||
define(`confDONT_INIT_GROUPS', `True')dnl
|
define(`confDONT_INIT_GROUPS', `True')dnl
|
||||||
+define(`confPID_FILE', `/var/run/sm-client.pid')dnl
|
+define(`confPID_FILE', `/run/sm-client.pid')dnl
|
||||||
+dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl
|
+dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl
|
||||||
+FEATURE(`use_ct_file')dnl
|
+FEATURE(`use_ct_file')dnl
|
||||||
dnl
|
dnl
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
define(`confDONT_INIT_GROUPS', `True')dnl
|
define(`confDONT_INIT_GROUPS', `True')dnl
|
||||||
+dnl # If you're operating in a DSCP/RFC-4594 environment with QoS
|
+dnl # If you're operating in a DSCP/RFC-4594 environment with QoS
|
||||||
+dnl define(`confINET_QOS', `AF11')dnl
|
+dnl define(`confINET_QOS', `AF11')dnl
|
||||||
define(`confPID_FILE', `/var/run/sm-client.pid')dnl
|
define(`confPID_FILE', `/run/sm-client.pid')dnl
|
||||||
dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl
|
dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl
|
||||||
FEATURE(`use_ct_file')dnl
|
FEATURE(`use_ct_file')dnl
|
||||||
--- sendmail-8.14.4/sendmail/sendmail.h.orig 2009-12-18 10:08:01.000000000 -0700
|
--- sendmail-8.14.4/sendmail/sendmail.h.orig 2009-12-18 10:08:01.000000000 -0700
|
||||||
|
@ -1,16 +1,18 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Sendmail Mail Transport Agent.
|
Description=Sendmail Mail Transport Agent
|
||||||
After=syslog.target network.target
|
After=syslog.target network.target
|
||||||
Conflicts=postfix.service exim.service
|
Conflicts=postfix.service exim.service
|
||||||
|
Wants=sm-client.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
Type=forking
|
||||||
|
PIDFile=/run/sendmail.pid
|
||||||
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 $DAEMON $QUEUE $SENDMAIL_OPTARG
|
||||||
ExecReload=-/etc/mail/make
|
ExecReload=-/etc/mail/make
|
||||||
ExecReload=-/etc/mail/make aliases
|
ExecReload=-/etc/mail/make aliases
|
||||||
RemainAfterExit=yes
|
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
@ -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: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: Sendmail
|
License: Sendmail
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
URL: http://www.sendmail.org/
|
URL: http://www.sendmail.org/
|
||||||
@ -673,6 +673,15 @@ exit 0
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 18 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.5-4
|
||||||
|
- Removed dots from description (there are no dots in systemd packaging
|
||||||
|
guidelines)
|
||||||
|
- Changed service type to forking and explicitly specified PID files
|
||||||
|
- Fixed creation of sm-client.pid
|
||||||
|
- Added Wants to sm-client.service and sendmail.service
|
||||||
|
- Replaced each occurrence of /var/run by /run in config files
|
||||||
|
- More details are available in rhbz#697636
|
||||||
|
|
||||||
* Thu Jun 30 2011 Jóhann B. Guðmundsson <johannbg@gmail.com> - 8.14.5-3
|
* Thu Jun 30 2011 Jóhann B. Guðmundsson <johannbg@gmail.com> - 8.14.5-3
|
||||||
- Introduce systemd unit file, drop SysV support
|
- Introduce systemd unit file, drop SysV support
|
||||||
|
|
||||||
|
@ -1,11 +1,16 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Sendmail Mail Transport Client.
|
Description=Sendmail Mail Transport Client
|
||||||
After=syslog.target network.target sendmail.service
|
After=syslog.target network.target sendmail.service
|
||||||
|
Wants=sendmail.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
Type=forking
|
||||||
|
PIDFile=/run/sm-client.pid
|
||||||
EnvironmentFile=-/etc/sysconfig/sendmail
|
EnvironmentFile=-/etc/sysconfig/sendmail
|
||||||
|
ExecStartPre=/bin/touch /run/sm-client.pid
|
||||||
|
ExecStartPre=/bin/chown smmsp:smmsp /run/sm-client.pid
|
||||||
|
ExecStartPre=-/sbin/restorecon /run/sm-client.pid
|
||||||
ExecStart=/usr/sbin/sendmail -L sm-msp-queue -Ac $QUEUE $SENDMAIL_OPTARG
|
ExecStart=/usr/sbin/sendmail -L sm-msp-queue -Ac $QUEUE $SENDMAIL_OPTARG
|
||||||
RemainAfterExit=yes
|
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
Loading…
Reference in New Issue
Block a user