]>
Commit | Line | Data |
---|---|---|
7460d227 AM |
1 | diff -ur rsync-3.0.8.orig/rsync.h rsync-3.0.8/rsync.h |
2 | --- rsync-3.0.8.orig/rsync.h 2011-02-21 20:32:51.000000000 +0100 | |
3 | +++ rsync-3.0.8/rsync.h 2011-04-07 10:21:07.794002236 +0200 | |
4 | @@ -29,7 +29,7 @@ | |
5 | /* RSYNCD_SYSCONF is now set in config.h */ | |
6 | #define RSYNCD_USERCONF "rsyncd.conf" | |
7 | ||
8 | -#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" | |
9 | +#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock" | |
10 | #define URL_PREFIX "rsync://" | |
11 | ||
12 | #define SYMLINK_PREFIX "/rsyncd-munged/" /* This MUST have a trailing slash! */ | |
7460d227 AM |
13 | diff -ur rsync-3.0.8.orig/rsyncd.conf.5 rsync-3.0.8/rsyncd.conf.5 |
14 | --- rsync-3.0.8.orig/rsyncd.conf.5 2011-03-26 22:37:52.000000000 +0100 | |
15 | +++ rsync-3.0.8/rsyncd.conf.5 2011-04-07 10:21:07.789502107 +0200 | |
9a0f13f9 | 16 | @@ -632,7 +632,7 @@ require that you specify a group passwor |
8c313d6a | 17 | passwords. |
9a0f13f9 AM |
18 | .IP |
19 | There is no default for the "secrets file" parameter, you must choose a | |
20 | -name (such as \fB/etc/rsyncd.secrets\fP). The file must normally not be | |
21 | +name (such as \fB/etc/rsyncd/rsyncd.secrets\fP). The file must normally not be | |
22 | readable by "other"; see "strict modes". If the file is not found or is | |
23 | rejected, no logins for a "user auth" module will be possible. | |
24 | .IP "\fBstrict\ modes\fP" | |
25 | @@ -1092,7 +1092,7 @@ that can be included into multiple modul | |
26 | global values that will affect connections (such as \fBmotd\ file\fP), or globals | |
27 | that will affect other include files. | |
28 | .P | |
29 | -For example, this is a useful /etc/rsyncd.conf file: | |
30 | +For example, this is a useful /etc/rsyncd/rsyncd.conf file: | |
31 | .RS 4 | |
32 | .P | |
33 | .nf | |
34 | @@ -1219,11 +1219,11 @@ pid file = /var/run/rsyncd.pid | |
9def7c32 AM |
35 | path = /data/cvs |
36 | comment = CVS repository (requires authentication) | |
37 | auth users = tridge, susan | |
7fee9aef AM |
38 | - secrets file = /etc/rsyncd.secrets |
39 | + secrets file = /etc/rsyncd/rsyncd.secrets | |
9a0f13f9 AM |
40 | .fi |
41 | .RE | |
42 | .P | |
7fee9aef AM |
43 | -The /etc/rsyncd.secrets file would look something like this: |
44 | +The /etc/rsyncd/rsyncd.secrets file would look something like this: | |
9a0f13f9 AM |
45 | .RS 4 |
46 | .P | |
47 | .nf | |
48 | @@ -1234,7 +1234,7 @@ susan:herpass | |
49 | .P | |
7fee9aef | 50 | .SH "FILES" |
9a0f13f9 | 51 | .P |
7fee9aef AM |
52 | -/etc/rsyncd.conf or rsyncd.conf |
53 | +/etc/rsyncd/rsyncd.conf or rsyncd.conf | |
9a0f13f9 | 54 | .P |
7fee9aef | 55 | .SH "SEE ALSO" |
9a0f13f9 | 56 | .P |