2
## 10_edit_config_paths.dpatch by Duncan Findlay <duncf@debian.org>
4
## All lines beginning with `## DP:' are a description of the patch.
5
## DP: Change all instances of /etc/mail/spamassassin in the documentation
6
## DP: to /etc/spamassassin, since thats where the configuration is going.
9
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
13
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
14
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
17
-patch) patch -p1 ${patch_opts} < $0;;
18
-unpatch) patch -R -p1 ${patch_opts} < $0;;
20
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
27
diff -urNad spamassassin~/INSTALL spamassassin/INSTALL
28
--- spamassassin~/INSTALL 2007-08-08 06:19:47.000000000 -0700
29
+++ spamassassin/INSTALL 2007-10-29 00:46:43.000000000 -0700
31
perl interpreter. Version 2.83 or later fixes this.
33
If you do not plan to use this plugin, be sure to comment out
34
- its loadplugin line in "/etc/mail/spamassassin/v310.pre".
35
+ its loadplugin line in "/etc/spamassassin/v310.pre".
39
diff -urNad spamassassin~/README spamassassin/README
40
--- spamassassin~/README 2007-08-08 06:19:47.000000000 -0700
41
+++ spamassassin/README 2007-10-29 00:46:43.000000000 -0700
43
not modify these, as they are overwritten when you run
46
- - /etc/mail/spamassassin/*.cf:
47
+ - /etc/spamassassin/*.cf:
49
Site config files, for system admins to create, modify, and
50
add local rules and scores to. Modifications here will be
51
appended to the config loaded from the above directory.
53
- - /etc/mail/spamassassin/*.pre:
54
+ - /etc/spamassassin/*.pre:
56
Plugin control files, installed from the distribution. These are
57
used to control what plugins are loaded. Modifications here will
60
You want to modify these files if you want to load additional
61
plugins, or inhibit loading a plugin that is enabled by default.
62
- If the files exist in /etc/mail/spamassassin, they will not
63
+ If the files exist in /etc/spamassassin, they will not
64
be overwritten during future installs.
66
- /usr/share/spamassassin/user_prefs.template:
68
Distributed default user preferences. Do not modify this, as it is
69
overwritten when you upgrade.
71
- - /etc/mail/spamassassin/user_prefs.template:
72
+ - /etc/spamassassin/user_prefs.template:
74
Default user preferences, for system admins to create, modify, and
75
set defaults for users' preferences files. Takes precedence over
76
the above prefs file, if it exists.
78
Do not put system-wide settings in here; put them in a file in the
79
- "/etc/mail/spamassassin" directory ending in ".cf". This file is
80
+ "/etc/spamassassin" directory ending in ".cf". This file is
81
just a template, which will be copied to a user's home directory
84
diff -urNad spamassassin~/UPGRADE spamassassin/UPGRADE
85
--- spamassassin~/UPGRADE 2007-08-08 06:19:47.000000000 -0700
86
+++ spamassassin/UPGRADE 2007-10-29 00:46:43.000000000 -0700
88
perldoc Mail::SpamAssassin::Plugin::* (ie AWL, DCC, etc)
90
- There are now multiple files read to enable plugins in the
91
- /etc/mail/spamassassin directory; previously only one, "init.pre" was
92
+ /etc/spamassassin directory; previously only one, "init.pre" was
93
read. Now both "init.pre", "v310.pre", and any other files ending
94
in ".pre" will be read. As future releases are made, new plugins
95
will be added to new files named according to the release they're
97
- If you are using a UNIX machine with all database files on local disks,
98
and no sharing of those databases across NFS filesystems, you can use a
99
more efficient, but non-NFS-safe, locking mechanism. Do this by adding
100
- the line "lock_method flock" to the /etc/mail/spamassassin/local.cf
101
+ the line "lock_method flock" to the /etc/spamassassin/local.cf
102
file. This is strongly recommended if you're not using NFS, as it is
103
much faster than the NFS-safe locker.
105
diff -urNad spamassassin~/USAGE spamassassin/USAGE
106
--- spamassassin~/USAGE 2007-08-08 06:19:47.000000000 -0700
107
+++ spamassassin/USAGE 2007-10-29 00:46:43.000000000 -0700
109
CPU-intensive task before they can send mail to you, so we give that
110
some bonus points. However, it requires that you list what addresses
111
you expect to receive mail for, by adding 'hashcash_accept' lines to
112
- your ~/.spamassassin/user_prefs or /etc/mail/spamassassin/local.cf
113
+ your ~/.spamassassin/user_prefs or /etc/spamassassin/local.cf
114
files. See the Mail::SpamAssassin::Plugin::Hashcash manual page for
115
details on how to specify these.
117
@@ -129,14 +129,14 @@
120
- You can create your own system-wide rules files in
121
- /etc/mail/spamassassin; their filenames should end in ".cf". Multiple
122
+ /etc/spamassassin; their filenames should end in ".cf". Multiple
123
files will be read, and SpamAssassin will not overwrite these files
124
when installing a new version.
127
- You should not modify the files in /usr/share/spamassassin; these
128
will be overwritten when you upgrade. Any changes you make in
129
- files in the /etc/mail/spamassassin directory, however, will
130
+ files in the /etc/spamassassin directory, however, will
131
override these files.
134
diff -urNad spamassassin~/ldap/README spamassassin/ldap/README
135
--- spamassassin~/ldap/README 2007-08-08 06:19:05.000000000 -0700
136
+++ spamassassin/ldap/README 2007-10-29 00:46:43.000000000 -0700
138
database or LDAP server.
140
SpamAssassin will check the global configuration file (ie. any file matching
141
-/etc/mail/spamassassin/*.cf) for the following settings:
142
+/etc/spamassassin/*.cf) for the following settings:
144
user_scores_dsn ldap://host:port/dc=basedn,dc=de?attr?scope?uid=__USERNAME__
145
user_scores_ldap_username bind dn
146
diff -urNad spamassassin~/lib/Mail/SpamAssassin/Conf.pm spamassassin/lib/Mail/SpamAssassin/Conf.pm
147
--- spamassassin~/lib/Mail/SpamAssassin/Conf.pm 2007-08-08 06:19:15.000000000 -0700
148
+++ spamassassin/lib/Mail/SpamAssassin/Conf.pm 2007-10-29 00:46:43.000000000 -0700
152
SpamAssassin is configured using traditional UNIX-style configuration files,
153
-loaded from the C</usr/share/spamassassin> and C</etc/mail/spamassassin>
154
+loaded from the C</usr/share/spamassassin> and C</etc/spamassassin>
157
The following web page lists the most important configuration settings
158
@@ -1763,7 +1763,7 @@
160
These settings differ from the ones above, in that they are considered
161
'privileged'. Only users running C<spamassassin> from their procmailrc's or
162
-forward files, or sysadmins editing a file in C</etc/mail/spamassassin>, can
163
+forward files, or sysadmins editing a file in C</etc/spamassassin>, can
164
use them. C<spamd> users cannot use them in their C<user_prefs> files, for
165
security and efficiency reasons, unless C<allow_user_rules> is enabled (and
166
then, they may only add rules from below).
167
diff -urNad spamassassin~/lib/Mail/SpamAssassin/Plugin/Test.pm spamassassin/lib/Mail/SpamAssassin/Plugin/Test.pm
168
--- spamassassin~/lib/Mail/SpamAssassin/Plugin/Test.pm 2007-08-08 06:19:14.000000000 -0700
169
+++ spamassassin/lib/Mail/SpamAssassin/Plugin/Test.pm 2007-10-29 00:46:43.000000000 -0700
173
To try this plugin, write the above two lines in the synopsis to
174
-C</etc/mail/spamassassin/plugintest.cf>.
175
+C</etc/spamassassin/plugintest.cf>.
179
diff -urNad spamassassin~/lib/spamassassin-run.pod spamassassin/lib/spamassassin-run.pod
180
--- spamassassin~/lib/spamassassin-run.pod 2007-08-08 06:19:15.000000000 -0700
181
+++ spamassassin/lib/spamassassin-run.pod 2007-10-29 00:46:43.000000000 -0700
183
-p prefs, --prefspath=file, --prefs-file=file
184
Set user preferences file
185
--siteconfigpath=path Path for site configs
186
- (def: /etc/mail/spamassassin)
187
+ (def: /etc/spamassassin)
188
--cf='config line' Additional line of configuration
189
-x, --nocreate-prefs Don't create user preferences file
190
-e, --exit-code Exit with a non-zero exit code if the
192
=item B<--siteconfigpath>=I<path>
194
Use the specified path for locating site-specific configuration files. Ignore
195
-the default directories (usually C</etc/mail/spamassassin> or similar).
196
+the default directories (usually C</etc/spamassassin> or similar).
198
=item B<--cf='config line'>
200
diff -urNad spamassassin~/rules/user_prefs.template spamassassin/rules/user_prefs.template
201
--- spamassassin~/rules/user_prefs.template 2007-08-08 06:19:21.000000000 -0700
202
+++ spamassassin/rules/user_prefs.template 2007-10-29 00:46:43.000000000 -0700
204
#* directory. At runtime, if a user has no preferences in their home directory
205
#* already, it will be copied for them, allowing them to perform personalised
206
#* customisation. If you want to make changes to the site-wide defaults,
207
-#* create a file in /etc/spamassassin or /etc/mail/spamassassin instead.
208
+#* create a file in /etc/spamassassin instead.
209
###########################################################################
211
# How many points before a mail is considered spam.
212
diff -urNad spamassassin~/sa-compile.raw spamassassin/sa-compile.raw
213
--- spamassassin~/sa-compile.raw 2007-08-08 06:19:47.000000000 -0700
214
+++ spamassassin/sa-compile.raw 2007-10-29 00:46:43.000000000 -0700
216
-p prefs, --prefspath=file, --prefs-file=file
217
Set user preferences file
218
--siteconfigpath=path Path for site configs
219
- (default: /etc/mail/spamassassin)
220
+ (default: /etc/spamassassin)
221
--updatedir=path Directory to place updates
222
(default: /var/lib/spamassassin/compiled/<version>)
223
--cf='config line' Additional line of configuration
225
=item B<--siteconfigpath>=I<path>
227
Use the specified path for locating site-specific configuration files. Ignore
228
-the default directories (usually C</etc/mail/spamassassin> or similar).
229
+the default directories (usually C</etc/spamassassin> or similar).
233
diff -urNad spamassassin~/sa-learn.raw spamassassin/sa-learn.raw
234
--- spamassassin~/sa-learn.raw 2007-08-08 06:19:47.000000000 -0700
235
+++ spamassassin/sa-learn.raw 2007-10-29 00:46:43.000000000 -0700
237
-p prefs, --prefspath=file, --prefs-file=file
238
Set user preferences file
239
--siteconfigpath=path Path for site configs
240
- (default: /etc/mail/spamassassin)
241
+ (default: /etc/spamassassin)
242
--cf='config line' Additional line of configuration
243
-D, --debug [area=n,...] Print debugging messages
244
-V, --version Print version
246
=item B<--siteconfigpath>=I<path>
248
Use the specified path for locating site-specific configuration files. Ignore
249
-the default directories (usually C</etc/mail/spamassassin> or similar).
250
+the default directories (usually C</etc/spamassassin> or similar).
252
=item B<--cf='config line'>
254
diff -urNad spamassassin~/spamc/spamc.pod spamassassin/spamc/spamc.pod
255
--- spamassassin~/spamc/spamc.pod 2007-08-08 06:19:38.000000000 -0700
256
+++ spamassassin/spamc/spamc.pod 2007-10-29 00:46:43.000000000 -0700
259
If the B<-F> switch is specified, that file will be used. Otherwise,
260
C<spamc> will attempt to load spamc.conf in C<SYSCONFDIR> (default:
261
-/etc/mail/spamassassin). If that file doesn't exist, and the B<-F>
262
-switch is not specified, no configuration file will be read.
263
+/etc/spamassassin). If that file doesn't exist, and the B<-F> switch
264
+is not specified, no configuration file will be read.
268
diff -urNad spamassassin~/spamd/README spamassassin/spamd/README
269
--- spamassassin~/spamd/README 2007-08-08 06:19:47.000000000 -0700
270
+++ spamassassin/spamd/README 2007-10-29 00:46:43.000000000 -0700
272
If you plan to use Bayesian classification (the BAYES rules) with spamd,
273
you will need to either
275
- 1. modify /etc/mail/spamassassin/local.cf to use a shared database of
276
+ 1. modify /etc/spamassassin/local.cf to use a shared database of
277
tokens, by setting the 'bayes_path' setting to a path all users can read
278
and write to. You will also need to set the 'bayes_file_mode' setting
279
to 0666 so that created files are shared, too.
280
diff -urNad spamassassin~/spamd/README.vpopmail spamassassin/spamd/README.vpopmail
281
--- spamassassin~/spamd/README.vpopmail 2007-08-08 06:19:47.000000000 -0700
282
+++ spamassassin/spamd/README.vpopmail 2007-10-29 00:46:43.000000000 -0700
284
/home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs
286
5. One gotcha - cannot have personal AWL dbs - only a sitewide AWL will work.
287
-This is specified in your /etc/mail/spamassassin/local.cf file. Perhaps a
288
+This is specified in your /etc/spamassassin/local.cf file. Perhaps a
289
future enhancement would be to add the capability to have personal AWL db.
291
6. Of course vpopmail must have the seekable patch installed (see
292
diff -urNad spamassassin~/spamd/spamd.raw spamassassin/spamd/spamd.raw
293
--- spamassassin~/spamd/spamd.raw 2007-08-08 06:19:47.000000000 -0700
294
+++ spamassassin/spamd/spamd.raw 2007-10-29 00:46:43.000000000 -0700
295
@@ -2712,7 +2712,7 @@
296
=item B<--siteconfigpath>=I<path>
298
Use the specified path for locating site-specific configuration files. Ignore
299
-the default directories (usually C</etc/mail/spamassassin> or similar).
300
+the default directories (usually C</etc/spamassassin> or similar).
302
=item B<--cf='config line'>
304
diff -urNad spamassassin~/sql/README spamassassin/sql/README
305
--- spamassassin~/sql/README 2007-08-08 06:19:37.000000000 -0700
306
+++ spamassassin/sql/README 2007-10-29 00:46:43.000000000 -0700
310
SpamAssassin will check the global configuration file (ie. any file matching
311
-/etc/mail/spamassassin/*.cf) for the following settings:
312
+/etc/spamassassin/*.cf) for the following settings:
314
user_scores_dsn DBI:driver:connection
315
user_scores_sql_username dbusername
316
diff -urNad spamassassin~/sql/README.awl spamassassin/sql/README.awl
317
--- spamassassin~/sql/README.awl 2007-08-08 06:19:37.000000000 -0700
318
+++ spamassassin/sql/README.awl 2007-10-29 00:46:43.000000000 -0700
320
auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList
322
SpamAssassin will check the global configuration file (ie. any file
323
-matching /etc/mail/spamassassin/*.cf) for the following settings:
324
+matching /etc/spamassassin/*.cf) for the following settings:
326
user_awl_dsn DBI:driver:database:hostname[:port]
327
user_awl_sql_username dbusername
328
diff -urNad spamassassin~/t/data/testplugin.pm spamassassin/t/data/testplugin.pm
329
--- spamassassin~/t/data/testplugin.pm 2007-08-08 06:19:47.000000000 -0700
330
+++ spamassassin/t/data/testplugin.pm 2007-10-29 00:46:43.000000000 -0700
334
-To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf:
335
+To try this out, write these lines to /etc/spamassassin/plugintest.cf:
337
loadplugin myTestPlugin
338
header MY_TEST_PLUGIN eval:check_test_plugin()
added
removed
debian/patches/10_change_config_paths.dpatch
