user.action: Add copyright information
[privoxy.git] / debian / patches / 14_config.patch
1 From: Roland Rosenfeld <roland@debian.org>
2 Date: Fri, 05 Jun 2020 15:51:09 +0200
3 Subject: Several Debian specific changes to config file
4 Forwarded: not-needed
5
6 --- a/config
7 +++ b/config
8 @@ -127,7 +127,7 @@
9  #          config file, because it is used while the config file is
10  #          being read.
11  #
12 -#user-manual https://www.privoxy.org/user-manual/
13 +user-manual /usr/share/doc/privoxy/user-manual
14  #
15  #  1.2. trust-info-url
16  #  ====================
17 @@ -259,7 +259,7 @@
18  #
19  #      No trailing "/", please.
20  #
21 -confdir .
22 +confdir /etc/privoxy
23  #
24  #  2.2. templdir
25  #  ==============
26 @@ -344,7 +344,7 @@ confdir .
27  #
28  #      No trailing "/", please.
29  #
30 -logdir .
31 +logdir /var/log/privoxy
32  #
33  #  2.5. actionsfile
34  #  =================
35 @@ -2483,7 +2483,7 @@ socket-timeout 300
36  #
37  #      ca-directory /usr/local/etc/privoxy/CA
38  #
39 -#ca-directory /usr/local/etc/privoxy/CA
40 +#ca-directory /etc/privoxy/CA
41  #
42  #  7.2. ca-cert-file
43  #  ==================
44 @@ -2650,7 +2650,7 @@ socket-timeout 300
45  #
46  #      certificate-directory /usr/local/var/privoxy/certs
47  #
48 -#certificate-directory /usr/local/var/privoxy/certs
49 +#certificate-directory /var/lib/privoxy/certs
50  #
51  #  7.6. cipher-list
52  #  =================
53 @@ -2779,7 +2779,7 @@ socket-timeout 300
54  #
55  #      trusted-cas-file trusted_cas_file.pem
56  #
57 -#trusted-cas-file trustedCAs.pem
58 +#trusted-cas-file /etc/ssl/certs/ca-certificates.crt
59  #
60  #  8. WINDOWS GUI OPTIONS
61  #  =======================