]>
Commit | Line | Data |
---|---|---|
5e04f218 AM |
1 | diff -ur clamav-0.97.1/etc//clamav-milter.conf.sample clamav-0.97.1.new/etc//clamav-milter.conf.sample |
2 | --- clamav-0.97.1/etc//clamav-milter.conf.sample 2011-01-10 18:48:28.000000000 +0100 | |
3 | +++ clamav-0.97.1.new/etc//clamav-milter.conf.sample 2011-07-14 18:24:02.801795736 +0200 | |
75ee8714 | 4 | @@ -3,7 +3,7 @@ |
5 | ## | |
6 | ||
7 | # Comment or remove the line below. | |
8 | -Example | |
9 | +#Example | |
10 | ||
11 | ||
12 | ## | |
13 | @@ -17,12 +17,12 @@ | |
14 | # inet6:port@[hostname|ip-address] - to specify an ipv6 socket | |
15 | # | |
16 | # Default: no default | |
17 | -#MilterSocket /tmp/clamav-milter.socket | |
18 | +MilterSocket /var/lib/clamav/clamav-milter.socket | |
19 | #MilterSocket inet:7357 | |
20 | ||
21 | # Define the group ownership for the (unix) milter socket. | |
22 | # Default: disabled (the primary group of the user running clamd) | |
23 | -#MilterSocketGroup virusgroup | |
24 | +#MilterSocketGroup clamav | |
25 | ||
26 | # Sets the permissions on the (unix) milter socket to the specified mode. | |
27 | # Default: disabled (obey umask) | |
75ee8714 | 28 | @@ -64,7 +64,7 @@ |
29 | # daemon (main thread). | |
30 | # | |
31 | # Default: disabled | |
32 | -#PidFile /var/run/clamav-milter.pid | |
33 | +PidFile /var/run/clamav/clamav-milter.pid | |
34 | ||
35 | # Optional path to the global temporary directory. | |
36 | # Default: system specific (usually /tmp or /var/tmp). | |
37 | @@ -90,7 +90,7 @@ | |
38 | # with the same socket: clamd servers will be selected in a round-robin fashion. | |
39 | # | |
40 | # Default: no default | |
41 | -#ClamdSocket tcp:scanner.mydomain:7357 | |
59f1ef4d | 42 | +ClamdSocket unix:/var/lib/clamav/clamd.socket |
75ee8714 | 43 | |
44 | ||
45 | ## | |
46 | @@ -238,13 +238,13 @@ | |
47 | # Use system logger (can work together with LogFile). | |
48 | # | |
49 | # Default: no | |
50 | -#LogSyslog yes | |
51 | +LogSyslog yes | |
52 | ||
53 | # Specify the type of syslog messages - please refer to 'man syslog' | |
54 | # for facility names. | |
55 | # | |
56 | # Default: LOG_LOCAL6 | |
57 | -#LogFacility LOG_MAIL | |
58 | +LogFacility LOG_MAIL | |
59 | ||
60 | # Enable verbose logging. | |
61 | # | |
5e04f218 AM |
62 | diff -ur clamav-0.97.1/etc//clamd.conf.sample clamav-0.97.1.new/etc//clamd.conf.sample |
63 | --- clamav-0.97.1/etc//clamd.conf.sample 2011-05-13 13:25:31.000000000 +0200 | |
64 | +++ clamav-0.97.1.new/etc//clamd.conf.sample 2011-07-14 18:19:05.824861957 +0200 | |
0c604439 | 65 | @@ -5,13 +5,13 @@ |
5664ab19 | 66 | |
c935072a MK |
67 | |
68 | # Comment or remove the line below. | |
69 | -Example | |
0c604439 | 70 | +#Example |
c935072a MK |
71 | |
72 | # Uncomment this option to enable logging. | |
0c604439 | 73 | # LogFile must be writable for the user running daemon. |
74 | # A full path is required. | |
75 | # Default: disabled | |
c935072a | 76 | -#LogFile /tmp/clamd.log |
0c604439 | 77 | +#LogFile /var/log/clamd.log |
c935072a MK |
78 | |
79 | # By default the log file is locked for writing - the lock protects against | |
80 | # running clamd multiple times (if want to run another clamd, please | |
20a53372 | 81 | @@ -40,12 +40,12 @@ |
c935072a MK |
82 | |
83 | # Use system logger (can work together with LogFile). | |
8934b66c ER |
84 | # Default: no |
85 | -#LogSyslog yes | |
86 | +LogSyslog yes | |
c935072a | 87 | |
7259763f | 88 | # Specify the type of syslog messages - please refer to 'man syslog' |
0c604439 | 89 | # for facility names. |
20a53372 ER |
90 | # Default: LOG_LOCAL6 |
91 | -#LogFacility LOG_MAIL | |
92 | +LogFacility LOG_MAIL | |
93 | ||
94 | # Enable verbose logging. | |
95 | # Default: no | |
75ee8714 | 96 | @@ -58,7 +58,7 @@ |
0c604439 | 97 | # This option allows you to save a process identifier of the listening |
c935072a | 98 | # daemon (main thread). |
0c604439 | 99 | # Default: disabled |
c935072a | 100 | -#PidFile /var/run/clamd.pid |
5664ab19 MK |
101 | +PidFile /var/run/clamav/clamd.pid |
102 | ||
103 | # Optional path to the global temporary directory. | |
0c604439 | 104 | # Default: system specific (usually /tmp or /var/tmp). |
75ee8714 | 105 | @@ -77,11 +77,11 @@ |
ae1cf7f1 AZ |
106 | |
107 | # Path to a local socket file the daemon will listen on. | |
108 | # Default: disabled (must be specified by a user) | |
4a475f58 | 109 | -#LocalSocket /tmp/clamd.socket |
ae1cf7f1 AZ |
110 | +LocalSocket /var/lib/clamav/clamd.socket |
111 | ||
4a475f58 | 112 | # Sets the group ownership on the unix socket. |
113 | # Default: disabled (the primary group of the user running clamd) | |
75ee8714 | 114 | -#LocalSocketGroup virusgroup |
115 | +#LocalSocketGroup clamav | |
116 | ||
117 | # Sets the permissions on the unix socket to the specified mode. | |
118 | # Default: disabled (socket is world accessible) | |
a4e64f4e | 119 | @@ -204,7 +204,7 @@ LocalSocket /var/lib/clamav/clamd.socket |
0c604439 | 120 | |
e1ead9e8 | 121 | # Run as another user (clamd must be started by root for this option to work) |
8934b66c | 122 | # Default: don't drop privileges |
c935072a MK |
123 | -#User clamav |
124 | +User clamav | |
125 | ||
8934b66c ER |
126 | # Stop daemon when libclamav reports out of memory condition. |
127 | #ExitOnOOM yes | |
5e04f218 AM |
128 | diff -ur clamav-0.97.1/etc//freshclam.conf.sample clamav-0.97.1.new/etc//freshclam.conf.sample |
129 | --- clamav-0.97.1/etc//freshclam.conf.sample 2011-01-10 18:48:28.000000000 +0100 | |
130 | +++ clamav-0.97.1.new/etc//freshclam.conf.sample 2011-07-14 18:14:32.705707450 +0200 | |
4a475f58 | 131 | @@ -3,9 +3,14 @@ |
0c604439 | 132 | ## Please read the freshclam.conf(5) manual before editing this file. |
c935072a | 133 | ## |
4a475f58 | 134 | |
5664ab19 MK |
135 | +## PLD NOTE: Note that freshclam is called periodically via cron |
136 | +## Check /etc/sysconfig/clamd for details | |
137 | +## Seems better to run task once per period than keep daemon running | |
0c604439 | 138 | +## only for that. |
5664ab19 MK |
139 | +## But if you have arguments please tell us. |
140 | ||
0c604439 | 141 | # Comment or remove the line below. |
142 | -Example | |
143 | +#Example | |
144 | ||
145 | # Path to the database directory. | |
146 | # WARNING: It must match clamd.conf's directive! | |
4a475f58 | 147 | @@ -30,11 +35,11 @@ |
5664ab19 MK |
148 | |
149 | # Enable verbose logging. | |
8934b66c ER |
150 | # Default: no |
151 | -#LogVerbose yes | |
152 | +LogVerbose yes | |
5664ab19 | 153 | |
0ad46739 | 154 | # Use system logger (can work together with UpdateLogFile). |
8934b66c ER |
155 | # Default: no |
156 | -#LogSyslog yes | |
157 | +LogSyslog yes | |
0ad46739 | 158 | |
7259763f | 159 | # Specify the type of syslog messages - please refer to 'man syslog' |
0c604439 | 160 | # for facility names. |
4a475f58 | 161 | @@ -48,7 +53,7 @@ |
0c604439 | 162 | # By default when started freshclam drops privileges and switches to the |
163 | # "clamav" user. This directive allows you to change the database owner. | |
164 | # Default: clamav (may depend on installation options) | |
5664ab19 MK |
165 | -#DatabaseOwner clamav |
166 | +DatabaseOwner clamav | |
167 | ||
8934b66c ER |
168 | # Initialize supplementary group access (freshclam must be started by root). |
169 | # Default: no | |
75ee8714 | 170 | @@ -96,7 +101,7 @@ |
5664ab19 | 171 | |
0c604439 | 172 | # Number of database checks per day. |
173 | # Default: 12 (every two hours) | |
174 | -#Checks 24 | |
5664ab19 MK |
175 | +Checks 2 |
176 | ||
177 | # Proxy settings | |
0c604439 | 178 | # Default: disabled |
75ee8714 | 179 | @@ -118,7 +123,7 @@ |
8934b66c ER |
180 | |
181 | # Send the RELOAD command to clamd. | |
182 | # Default: no | |
183 | -#NotifyClamd /path/to/clamd.conf | |
38d9666e | 184 | +#NotifyClamd /etc/clamd.conf |
c935072a | 185 | |
0c604439 | 186 | # Run command after successful database update. |
187 | # Default: disabled |