diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-12-29 10:03:51 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-12-29 10:03:51 +0000 |
| commit | 4b66fb1e8bdec5736a0605d343b2a82f8e0760ff (patch) | |
| tree | 0e02accd054544daafe3041b482b013607c41e42 /mail-filter | |
| parent | ppc64 stable wrt bug #492070 (diff) | |
| download | gentoo-2-4b66fb1e8bdec5736a0605d343b2a82f8e0760ff.tar.gz gentoo-2-4b66fb1e8bdec5736a0605d343b2a82f8e0760ff.tar.bz2 gentoo-2-4b66fb1e8bdec5736a0605d343b2a82f8e0760ff.zip | |
Move -c and -H to the config file as collides with other options people want to use (#496254#c10 by Evert)
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'mail-filter')
| -rw-r--r-- | mail-filter/spamassassin/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-filter/spamassassin/files/spamassassin.service-r1 | 2 | ||||
| -rw-r--r-- | mail-filter/spamassassin/files/spamassassin.service.conf | 7 |
3 files changed, 13 insertions, 3 deletions
diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog index 8c83b9e056be..2563559d0223 100644 --- a/mail-filter/spamassassin/ChangeLog +++ b/mail-filter/spamassassin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-filter/spamassassin # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.230 2013/12/28 13:56:06 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.231 2013/12/29 10:03:51 pacho Exp $ + + 29 Dec 2013; Pacho Ramos <pacho@gentoo.org> files/spamassassin.service-r1, + files/spamassassin.service.conf: + Move -c and -H to the config file as collides with other options people want + to use (#496254#c10 by Evert) *spamassassin-3.3.2-r4 (28 Dec 2013) diff --git a/mail-filter/spamassassin/files/spamassassin.service-r1 b/mail-filter/spamassassin/files/spamassassin.service-r1 index 17817f4bdd23..fa60132d5307 100644 --- a/mail-filter/spamassassin/files/spamassassin.service-r1 +++ b/mail-filter/spamassassin/files/spamassassin.service-r1 @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=forking PIDFile=/var/run/spamd.pid -ExecStart=/usr/sbin/spamd -d --pidfile /var/run/spamd.pid -m 5 -c -H $SPAMD_OPTS +ExecStart=/usr/sbin/spamd -d --pidfile /var/run/spamd.pid -m 5 $SPAMD_OPTS StandardOutput=syslog StandardError=syslog Restart=always diff --git a/mail-filter/spamassassin/files/spamassassin.service.conf b/mail-filter/spamassassin/files/spamassassin.service.conf index c8dc2fe55a1e..9fc1f6294525 100644 --- a/mail-filter/spamassassin/files/spamassassin.service.conf +++ b/mail-filter/spamassassin/files/spamassassin.service.conf @@ -1,5 +1,10 @@ # Here you can append some options to spamd process, please # double check that you make needed changes in service file if # you use options requiring it +# Some options: +# +# -c to create a per user configuration file +# -H [dir] to switch home dirs for helper apps, dir optional + [Service] -Environment="SPAMD_OPTS=" +Environment="SPAMD_OPTS= -c -H" |