diff options
author | Michael Orlitzky <mjo@gentoo.org> | 2017-08-20 09:52:40 -0400 |
---|---|---|
committer | Michael Orlitzky <mjo@gentoo.org> | 2017-08-20 10:32:44 -0400 |
commit | 2d2b99bbe0ceafbfd2601508d9dfe67a76ec83b3 (patch) | |
tree | 0a1b64c79d412ba78abf9e0bd959bde008a4e73e /mail-filter/spamassassin/files | |
parent | mail-filter/spamassassin: new revision to fix tests and improve init script. (diff) | |
download | gentoo-2d2b99bbe0ceafbfd2601508d9dfe67a76ec83b3.tar.gz gentoo-2d2b99bbe0ceafbfd2601508d9dfe67a76ec83b3.tar.bz2 gentoo-2d2b99bbe0ceafbfd2601508d9dfe67a76ec83b3.zip |
mail-filter/spamassassin: synchronize the systemd service configuration.
This commit brings the systemd service and its configuration back in
sync with OpenRC:
* The SPAMD_OPTS passed to the daemon now match OpenRC's.
* We no longer pass --daemon to spamd, and thus we don't have to
specify that the daemon forks or track its PID file in the
service.
* The "spamd" user and group are used for the service.
Gentoo-Bug: 590346
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'mail-filter/spamassassin/files')
-rw-r--r-- | mail-filter/spamassassin/files/spamassassin.service-r2 | 14 | ||||
-rw-r--r-- | mail-filter/spamassassin/files/spamassassin.service.conf-r1 | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/mail-filter/spamassassin/files/spamassassin.service-r2 b/mail-filter/spamassassin/files/spamassassin.service-r2 new file mode 100644 index 000000000000..ecb9ba392167 --- /dev/null +++ b/mail-filter/spamassassin/files/spamassassin.service-r2 @@ -0,0 +1,14 @@ +[Unit] +Description=Spamassassin daemon +After=syslog.target network.target + +[Service] +ExecStart=/usr/sbin/spamd $SPAMD_OPTS +ExecReload=/bin/kill -HUP $MAINPID +User=spamd +Group=spamd +StandardOutput=syslog +StandardError=syslog + +[Install] +WantedBy=multi-user.target diff --git a/mail-filter/spamassassin/files/spamassassin.service.conf-r1 b/mail-filter/spamassassin/files/spamassassin.service.conf-r1 new file mode 100644 index 000000000000..75918e824f22 --- /dev/null +++ b/mail-filter/spamassassin/files/spamassassin.service.conf-r1 @@ -0,0 +1,2 @@ +[Service] +Environment="SPAMD_OPTS=--max-children=5 --create-prefs --helper-home-dir" |