summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmish2020-01-12 19:11:46 +0530
committerAmish2020-01-12 19:11:46 +0530
commitd9e37ce9597aec55f75280229beee15849d957e8 (patch)
treeca9b67eb58e58bfe6d2a60a9eef41143d8a623c1
parent70765e157f1f9cb3a153cfce657ddafca0d9e64c (diff)
downloadaur-d9e37ce9597aec55f75280229beee15849d957e8.tar.gz
Modify service files. Support sendmail service reload
-rw-r--r--PKGBUILD6
-rw-r--r--sendmail.service6
-rw-r--r--sm-client.service2
3 files changed, 9 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 114dea2ecc81..05cdfb3218ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgdesc="A general purpose internetwork email routing MTA"
url="http://www.sendmail.org"
arch=('x86_64')
license=('custom:sendmail')
-provides=('sendmail=8.15')
+provides=('sendmail=8.15' 'smtp-server' 'smtp-forwarder')
conflicts=('msmtp-mta' 'postfix' 'exim' 'opensmtpd')
backup=('etc/conf.d/sendmail'
'etc/mail/aliases'
@@ -41,8 +41,8 @@ sha256sums=('24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439'
'9b4d2d141191f6c9a18538f7acf65243cceb26359f88b64c92c1c4e8407398f0'
'95531a87d42e30742ca71f7d7197403eb9d703a407a50c9fda1f909ed21e1010'
'3469c3c503ef24ccaedeb69b35787ef3745852cf9dc78540f5ec4195d2b817d7'
- 'c53eebc1b5e362bd395cbb1c52354efdc956b9607d06656da2c5a2500554ebc7'
- 'ecbd0a27e868d73d87fcfec292c19ea9479d0a8e9783788596d9add5e012218f')
+ 'd18c2c716eb94cb22082a7e4693e635222d2b5c7daa2ecc80025179cfd438b3d'
+ 'c934a46aabe61526687f46d34aa0406d886d982aa10a57980a59464e24538d95')
prepare() {
# patches picked from Fedora
diff --git a/sendmail.service b/sendmail.service
index c15cb1e36ac2..f6e65645e262 100644
--- a/sendmail.service
+++ b/sendmail.service
@@ -8,8 +8,12 @@ Wants=sm-client.service
Type=forking
PIDFile=/run/sendmail.pid
EnvironmentFile=/etc/conf.d/sendmail
-ExecStartPre=-/usr/bin/newaliases > /dev/null 2>&1
+ExecStartPre=-/usr/bin/newaliases
ExecStart=/usr/sbin/sendmail -bd $SENDMAIL_OPTS $SENDMAIL_OPTARG
+ExecReload=/usr/bin/kill -HUP $MAINPID
+# hack to allow async reload to complete, otherwise systemd may signal error
+ExecReload=/usr/bin/sleep 2
[Install]
WantedBy=multi-user.target
+Also=sm-client.service
diff --git a/sm-client.service b/sm-client.service
index 12f9bbc69846..3d43a00e1808 100644
--- a/sm-client.service
+++ b/sm-client.service
@@ -1,7 +1,7 @@
[Unit]
Description=Sendmail Mail Transport Client
After=syslog.target network.target sendmail.service
-Wants=sendmail.service
+Conflicts=postfix.service exim.service
BindsTo=sendmail.service
[Service]