1 diff -ur rsync-3.0.0pre6.org/rsync.1 rsync-3.0.0pre6/rsync.1
2 --- rsync-3.0.0pre6.org/rsync.1 2007-11-28 10:00:29.000000000 +0100
3 +++ rsync-3.0.0pre6/rsync.1 2007-12-10 22:18:49.896441464 +0100
5 .IP "\fB\-\-config=FILE\fP"
6 This specifies an alternate config file than
7 the default. This is only relevant when \fB\-\-daemon\fP is specified.
8 -The default is /etc/rsyncd.conf unless the daemon is running over
9 +The default is /etc/rsyncd/rsyncd.conf unless the daemon is running over
10 a remote shell program and the remote user is not the super-user; in that case
11 the default is rsyncd.conf in the current directory (typically $HOME).
17 -/etc/rsyncd.conf or rsyncd.conf
18 +/etc/rsyncd/rsyncd.conf or rsyncd.conf
22 diff -ur rsync-3.0.0pre6.org/rsyncd.conf.5 rsync-3.0.0pre6/rsyncd.conf.5
23 --- rsync-3.0.0pre6.org/rsyncd.conf.5 2007-11-28 10:00:29.000000000 +0100
24 +++ rsync-3.0.0pre6/rsyncd.conf.5 2007-12-10 22:19:26.808284001 +0100
26 support the \(lqmax connections\(rq option. The rsync daemon uses record
27 locking on this file to ensure that the max connections limit is not
28 exceeded for the modules sharing the lock file.
29 -The default is \f(CW/var/run/rsyncd.lock\fP.
30 +The default is \f(CW/var/lock/rsyncd.lock\fP.
33 The \(lqread only\(rq option determines whether clients
35 you may find that passwords longer than 8 characters don't work.
37 There is no default for the \(lqsecrets file\(rq option, you must choose a name
38 -(such as \f(CW/etc/rsyncd.secrets\fP). The file must normally not be readable
39 +(such as \f(CW/etc/rsyncd/rsyncd.secrets\fP). The file must normally not be readable
40 by \(lqother\(rq; see \(lqstrict modes\(rq.
42 .IP "\fBstrict modes\fP"
45 comment = CVS repository (requires authentication)
46 auth users = tridge, susan
47 - secrets file = /etc/rsyncd.secrets
48 + secrets file = /etc/rsyncd/rsyncd.secrets
53 -The /etc/rsyncd.secrets file would look something like this:
54 +The /etc/rsyncd/rsyncd.secrets file would look something like this:
62 -/etc/rsyncd.conf or rsyncd.conf
63 +/etc/rsyncd/rsyncd.conf or rsyncd.conf
67 diff -ur rsync-3.0.0pre6.org/rsyncd.conf.yo rsync-3.0.0pre6/rsyncd.conf.yo
68 --- rsync-3.0.0pre6.org/rsyncd.conf.yo 2007-11-28 10:00:37.000000000 +0100
69 +++ rsync-3.0.0pre6/rsyncd.conf.yo 2007-12-10 22:15:49.037413489 +0100
71 reread its config file.
73 Note that you should bf(not) send the rsync daemon a HUP signal to force
74 -it to reread the tt(rsyncd.conf) file. The file is re-read on each client
75 +it to reread the tt(/etc/rsyncd/rsyncd.conf) file. The file is re-read on each client
78 manpagesection(GLOBAL OPTIONS)
81 dit(bf(path)) The "path" option specifies the directory in the daemon's
82 filesystem to make available in this module. You must specify this option
83 -for each module in tt(rsyncd.conf).
84 +for each module in tt(/etc/rsyncd/rsyncd.conf).
86 dit(bf(use chroot)) If "use chroot" is true, the rsync daemon will chroot
87 to the "path" before starting the file transfer with the client. This has
89 you may find that passwords longer than 8 characters don't work.
91 There is no default for the "secrets file" option, you must choose a name
92 -(such as tt(/etc/rsyncd.secrets)). The file must normally not be readable
93 +(such as tt(/etc/rsyncd/rsyncd.secrets)). The file must normally not be readable
94 by "other"; see "strict modes".
96 dit(bf(strict modes)) The "strict modes" option determines whether or not
99 comment = CVS repository (requires authentication)
100 auth users = tridge, susan
101 - secrets file = /etc/rsyncd.secrets
102 + secrets file = /etc/rsyncd/rsyncd.secrets
105 -The /etc/rsyncd.secrets file would look something like this:
106 +The /etc/rsyncd/rsyncd.secrets file would look something like this:
109 tt(tridge:mypass)nl()
110 diff -ur rsync-3.0.0pre6.org/rsync.h rsync-3.0.0pre6/rsync.h
111 --- rsync-3.0.0pre6.org/rsync.h 2007-11-27 16:34:59.000000000 +0100
112 +++ rsync-3.0.0pre6/rsync.h 2007-12-10 22:15:49.064081486 +0100
114 /* RSYNCD_SYSCONF is now set in config.h */
115 #define RSYNCD_USERCONF "rsyncd.conf"
117 -#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
118 +#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
119 #define URL_PREFIX "rsync://"
121 #define SYMLINK_PREFIX "/rsyncd-munged/"
122 diff -ur rsync-3.0.0pre6.org/rsync.yo rsync-3.0.0pre6/rsync.yo
123 --- rsync-3.0.0pre6.org/rsync.yo 2007-11-28 10:00:37.000000000 +0100
124 +++ rsync-3.0.0pre6/rsync.yo 2007-12-10 22:15:49.067414986 +0100
125 @@ -2062,7 +2062,7 @@
126 If standard input is a socket then rsync will assume that it is being
127 run via inetd, otherwise it will detach from the current terminal and
128 become a background daemon. The daemon will read the config file
129 -(rsyncd.conf) on each connect made by a client and respond to
130 +(/etc/rsyncd/rsyncd.conf) on each connect made by a client and respond to
131 requests accordingly. See the bf(rsyncd.conf)(5) man page for more
134 @@ -2080,7 +2080,7 @@
136 dit(bf(--config=FILE)) This specifies an alternate config file than
137 the default. This is only relevant when bf(--daemon) is specified.
138 -The default is /etc/rsyncd.conf unless the daemon is running over
139 +The default is /etc/rsyncd/rsyncd.conf unless the daemon is running over
140 a remote shell program and the remote user is not the super-user; in that case
141 the default is rsyncd.conf in the current directory (typically $HOME).
143 @@ -2810,7 +2810,7 @@
147 -/etc/rsyncd.conf or rsyncd.conf
148 +/etc/rsyncd/rsyncd.conf or rsyncd.conf