]>
Commit | Line | Data |
---|---|---|
7fee9aef AM |
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 | |
4 | @@ -2398,7 +2398,7 @@ | |
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). | |
9def7c32 | 12 | .IP |
7fee9aef AM |
13 | @@ -3302,7 +3302,7 @@ |
14 | .SH "FILES" | |
15 | ||
16 | .PP | |
17 | -/etc/rsyncd.conf or rsyncd.conf | |
18 | +/etc/rsyncd/rsyncd.conf or rsyncd.conf | |
19 | .PP | |
20 | .SH "SEE ALSO" | |
21 | ||
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 | |
25 | @@ -268,7 +268,7 @@ | |
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. | |
31 | .IP | |
32 | .IP "\fBread only\fP" | |
33 | The \(lqread only\(rq option determines whether clients | |
34 | @@ -408,7 +408,7 @@ | |
1fd5e8cf | 35 | you may find that passwords longer than 8 characters don\(cq\&t work. |
9def7c32 | 36 | .IP |
1fd5e8cf | 37 | There is no default for the \(dq\&secrets file\(dq\& parameter, you must choose a name |
7fee9aef AM |
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 | |
1fd5e8cf | 40 | by \(dq\&other\(dq\&; see \(dq\&strict modes\(dq\&. |
7fee9aef AM |
41 | .IP |
42 | .IP "\fBstrict modes\fP" | |
43 | @@ -733,12 +733,12 @@ | |
9def7c32 AM |
44 | path = /data/cvs |
45 | comment = CVS repository (requires authentication) | |
46 | auth users = tridge, susan | |
7fee9aef AM |
47 | - secrets file = /etc/rsyncd.secrets |
48 | + secrets file = /etc/rsyncd/rsyncd.secrets | |
9def7c32 | 49 | |
13dec03c | 50 | .fi |
9def7c32 AM |
51 | |
52 | .PP | |
7fee9aef AM |
53 | -The /etc/rsyncd.secrets file would look something like this: |
54 | +The /etc/rsyncd/rsyncd.secrets file would look something like this: | |
9def7c32 | 55 | .PP |
65bac86c AM |
56 | .RS |
57 | \f(CWtridge:mypass\fP | |
7fee9aef AM |
58 | @@ -751,7 +751,7 @@ |
59 | .SH "FILES" | |
60 | ||
9def7c32 | 61 | .PP |
7fee9aef AM |
62 | -/etc/rsyncd.conf or rsyncd.conf |
63 | +/etc/rsyncd/rsyncd.conf or rsyncd.conf | |
9def7c32 | 64 | .PP |
7fee9aef AM |
65 | .SH "SEE ALSO" |
66 | ||
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 | |
06295e94 | 70 | @@ -66,7 +66,7 @@ |
cbdb69ef | 71 | reread its config file. |
9def7c32 | 72 | |
602c20e0 | 73 | Note that you should bf(not) send the rsync daemon a HUP signal to force |
c9a2c537 MW |
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 | |
d2da20aa | 76 | connection. |
9def7c32 AM |
77 | |
78 | manpagesection(GLOBAL OPTIONS) | |
7fee9aef | 79 | @@ -122,7 +122,7 @@ |
9def7c32 | 80 | |
0150c6b7 AM |
81 | dit(bf(path)) The "path" parameter specifies the directory in the daemon's |
82 | filesystem to make available in this module. You must specify this parameter | |
c9a2c537 | 83 | -for each module in tt(rsyncd.conf). |
e1dcc2c2 | 84 | +for each module in tt(/etc/rsyncd/rsyncd.conf). |
9def7c32 | 85 | |
602c20e0 | 86 | dit(bf(use chroot)) If "use chroot" is true, the rsync daemon will chroot |
9def7c32 | 87 | to the "path" before starting the file transfer with the client. This has |
7fee9aef AM |
88 | @@ -360,7 +360,7 @@ |
89 | you may find that passwords longer than 8 characters don't work. | |
9def7c32 | 90 | |
0150c6b7 | 91 | There is no default for the "secrets file" parameter, you must choose a name |
13dec03c | 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". | |
9def7c32 | 95 | |
0150c6b7 | 96 | dit(bf(strict modes)) The "strict modes" parameter determines whether or not |
7fee9aef | 97 | @@ -624,10 +624,10 @@ |
9def7c32 AM |
98 | path = /data/cvs |
99 | comment = CVS repository (requires authentication) | |
100 | auth users = tridge, susan | |
e1dcc2c2 | 101 | - secrets file = /etc/rsyncd.secrets |
102 | + secrets file = /etc/rsyncd/rsyncd.secrets | |
9def7c32 AM |
103 | ) |
104 | ||
e1dcc2c2 | 105 | -The /etc/rsyncd.secrets file would look something like this: |
106 | +The /etc/rsyncd/rsyncd.secrets file would look something like this: | |
9def7c32 | 107 | |
602c20e0 | 108 | quote( |
109 | tt(tridge:mypass)nl() | |
7fee9aef AM |
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 | |
113 | @@ -29,7 +29,7 @@ | |
697fec4c AG |
114 | /* RSYNCD_SYSCONF is now set in config.h */ |
115 | #define RSYNCD_USERCONF "rsyncd.conf" | |
116 | ||
117 | -#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" | |
118 | +#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock" | |
119 | #define URL_PREFIX "rsync://" | |
120 | ||
7fee9aef AM |
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 @@ | |
697fec4c AG |
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 | |
8b97b449 | 131 | requests accordingly. See the bf(rsyncd.conf)(5) man page for more |
697fec4c AG |
132 | details. |
133 | ||
7fee9aef | 134 | @@ -2080,7 +2080,7 @@ |
8b97b449 AM |
135 | |
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). | |
142 | ||
7fee9aef | 143 | @@ -2810,7 +2810,7 @@ |
697fec4c AG |
144 | |
145 | manpagefiles() | |
146 | ||
147 | -/etc/rsyncd.conf or rsyncd.conf | |
148 | +/etc/rsyncd/rsyncd.conf or rsyncd.conf | |
149 | ||
150 | manpageseealso() | |
151 |