summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'mail-filter/spamassassin')
-rw-r--r--mail-filter/spamassassin/files/spamassassin.service-r3 (renamed from mail-filter/spamassassin/files/spamassassin.service-r2)4
-rw-r--r--mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild (renamed from mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild)2
2 files changed, 2 insertions, 4 deletions
diff --git a/mail-filter/spamassassin/files/spamassassin.service-r2 b/mail-filter/spamassassin/files/spamassassin.service-r3
index 803205717846..6bc74c46cc5f 100644
--- a/mail-filter/spamassassin/files/spamassassin.service-r2
+++ b/mail-filter/spamassassin/files/spamassassin.service-r3
@@ -3,10 +3,8 @@ Description=Spamassassin daemon
After=network.target
[Service]
-ExecStart=/usr/sbin/spamd $SPAMD_OPTS
+ExecStart=/usr/sbin/spamd --username=spamd --groupname=spamd $SPAMD_OPTS
ExecReload=/bin/kill -HUP $MAINPID
-User=spamd
-Group=spamd
[Install]
WantedBy=multi-user.target
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
index 47d77f361f73..3273f6b1706b 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
@@ -158,7 +158,7 @@ src_install () {
newinitd "${FILESDIR}/3.4.1-spamd.init-r1" spamd
newconfd "${FILESDIR}/3.4.1-spamd.conf" spamd
- systemd_newunit "${FILESDIR}/${PN}.service-r2" "${PN}.service"
+ systemd_newunit "${FILESDIR}/${PN}.service-r3" "${PN}.service"
systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r1" \
"${PN}.service"