1 diff -ur rsync-3.0.8.orig/rsync.1 rsync-3.0.8/rsync.1
2 --- rsync-3.0.8.orig/rsync.1 2011-03-26 22:37:52.000000000 +0100
3 +++ rsync-3.0.8/rsync.1 2011-04-07 10:27:01.761502719 +0200
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.8.orig/rsync.h rsync-3.0.8/rsync.h
23 --- rsync-3.0.8.orig/rsync.h 2011-02-21 20:32:51.000000000 +0100
24 +++ rsync-3.0.8/rsync.h 2011-04-07 10:21:07.794002236 +0200
26 /* RSYNCD_SYSCONF is now set in config.h */
27 #define RSYNCD_USERCONF "rsyncd.conf"
29 -#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
30 +#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
31 #define URL_PREFIX "rsync://"
33 #define SYMLINK_PREFIX "/rsyncd-munged/" /* This MUST have a trailing slash! */
34 diff -ur rsync-3.0.8.orig/rsync.yo rsync-3.0.8/rsync.yo
35 --- rsync-3.0.8.orig/rsync.yo 2011-03-26 22:34:18.000000000 +0100
36 +++ rsync-3.0.8/rsync.yo 2011-04-07 10:21:07.798002324 +0200
38 If standard input is a socket then rsync will assume that it is being
39 run via inetd, otherwise it will detach from the current terminal and
40 become a background daemon. The daemon will read the config file
41 -(rsyncd.conf) on each connect made by a client and respond to
42 +(/etc/rsyncd/rsyncd.conf) on each connect made by a client and respond to
43 requests accordingly. See the bf(rsyncd.conf)(5) man page for more
48 dit(bf(--config=FILE)) This specifies an alternate config file than
49 the default. This is only relevant when bf(--daemon) is specified.
50 -The default is /etc/rsyncd.conf unless the daemon is running over
51 +The default is /etc/rsyncd/rsyncd.conf unless the daemon is running over
52 a remote shell program and the remote user is not the super-user; in that case
53 the default is rsyncd.conf in the current directory (typically $HOME).
59 -/etc/rsyncd.conf or rsyncd.conf
60 +/etc/rsyncd/rsyncd.conf or rsyncd.conf
64 diff -ur rsync-3.0.8.orig/rsyncd.conf.5 rsync-3.0.8/rsyncd.conf.5
65 --- rsync-3.0.8.orig/rsyncd.conf.5 2011-03-26 22:37:52.000000000 +0100
66 +++ rsync-3.0.8/rsyncd.conf.5 2011-04-07 10:21:07.789502107 +0200
68 support the \(dq\&max connections\(dq\& parameter. The rsync daemon uses record
69 locking on this file to ensure that the max connections limit is not
70 exceeded for the modules sharing the lock file.
71 -The default is \f(CW/var/run/rsyncd.lock\fP.
72 +The default is \f(CW/var/lock/rsyncd.lock\fP.
75 This parameter determines whether clients
79 There is no default for the \(dq\&secrets file\(dq\& parameter, you must choose a name
80 -(such as \f(CW/etc/rsyncd.secrets\fP). The file must normally not be readable
81 +(such as \f(CW/etc/rsyncd/rsyncd.secrets\fP). The file must normally not be readable
82 by \(dq\&other\(dq\&; see \(dq\&strict modes\(dq\&. If the file is not found or is rejected, no
83 logins for a \(dq\&user auth\(dq\& module will be possible.
87 comment = CVS repository (requires authentication)
88 auth users = tridge, susan
89 - secrets file = /etc/rsyncd.secrets
90 + secrets file = /etc/rsyncd/rsyncd.secrets
95 -The /etc/rsyncd.secrets file would look something like this:
96 +The /etc/rsyncd/rsyncd.secrets file would look something like this:
104 -/etc/rsyncd.conf or rsyncd.conf
105 +/etc/rsyncd/rsyncd.conf or rsyncd.conf
109 diff -ur rsync-3.0.8.orig/rsyncd.conf.yo rsync-3.0.8/rsyncd.conf.yo
110 --- rsync-3.0.8.orig/rsyncd.conf.yo 2011-03-26 22:34:18.000000000 +0100
111 +++ rsync-3.0.8/rsyncd.conf.yo 2011-04-07 10:21:07.792002183 +0200
113 reread its config file.
115 Note that you should bf(not) send the rsync daemon a HUP signal to force
116 -it to reread the tt(rsyncd.conf) file. The file is re-read on each client
117 +it to reread the tt(/etc/rsyncd/rsyncd.conf) file. The file is re-read on each client
120 manpagesection(GLOBAL PARAMETERS)
123 dit(bf(path)) This parameter specifies the directory in the daemon's
124 filesystem to make available in this module. You must specify this parameter
125 -for each module in tt(rsyncd.conf).
126 +for each module in tt(/etc/rsyncd/rsyncd.conf).
128 dit(bf(use chroot)) If "use chroot" is true, the rsync daemon will chroot
129 to the "path" before starting the file transfer with the client. This has
133 There is no default for the "secrets file" parameter, you must choose a name
134 -(such as tt(/etc/rsyncd.secrets)). The file must normally not be readable
135 +(such as tt(/etc/rsyncd/rsyncd.secrets)). The file must normally not be readable
136 by "other"; see "strict modes". If the file is not found or is rejected, no
137 logins for a "user auth" module will be possible.
139 @@ -673,10 +673,10 @@
141 comment = CVS repository (requires authentication)
142 auth users = tridge, susan
143 - secrets file = /etc/rsyncd.secrets
144 + secrets file = /etc/rsyncd/rsyncd.secrets
147 -The /etc/rsyncd.secrets file would look something like this:
148 +The /etc/rsyncd/rsyncd.secrets file would look something like this:
151 tt(tridge:mypass)nl()