]>
Commit | Line | Data |
---|---|---|
e1dcc2c2 | 1 | diff -ruN rsync-2.3.2/rsync.h rsync-2.3.2-new/rsync.h |
2 | --- rsync-2.3.2/rsync.h Mon Nov 8 14:15:02 1999 | |
3 | +++ rsync-2.3.2-new/rsync.h Fri Nov 19 17:51:35 1999 | |
9def7c32 AM |
4 | @@ -24,9 +24,9 @@ |
5 | #define RSYNC_RSH_ENV "RSYNC_RSH" | |
6 | ||
7 | #define RSYNC_NAME "rsync" | |
e1dcc2c2 | 8 | -#define RSYNCD_CONF "/etc/rsyncd.conf" |
9 | +#define RSYNCD_CONF "/etc/rsyncd/rsyncd.conf" | |
9def7c32 | 10 | |
e1dcc2c2 | 11 | -#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" |
12 | +#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock" | |
9def7c32 AM |
13 | #define URL_PREFIX "rsync://" |
14 | ||
15 | #define BACKUP_SUFFIX "~" | |
13dec03c | 16 | --- rsync-2.5.2/rsync.yo.orig Fri Jan 25 11:42:23 2002 |
17 | +++ rsync-2.5.2/rsync.yo Sat Jan 26 07:10:18 2002 | |
cbdb69ef | 18 | @@ -173,7 +173,7 @@ |
9def7c32 AM |
19 | manpagesection(RUNNING AN RSYNC SERVER) |
20 | ||
21 | An rsync server is configured using a config file which by default is | |
e1dcc2c2 | 22 | -called /etc/rsyncd.conf. Please see the rsyncd.conf(5) man page for more |
23 | +called /etc/rsyncd/rsyncd.conf. Please see the rsyncd.conf(5) man page for more | |
9def7c32 AM |
24 | information. |
25 | ||
26 | manpagesection(EXAMPLES) | |
13dec03c | 27 | @@ -628,7 +628,7 @@ |
28 | If standard input is a socket then rsync will assume that it is being | |
29 | run via inetd, otherwise it will detach from the current terminal and | |
30 | become a background daemon. The daemon will read the config file | |
31 | -(/etc/rsyncd.conf) on each connect made by a client and respond to | |
32 | +(/etc/rsyncd/rsyncd.conf) on each connect made by a client and respond to | |
33 | requests accordingly. See the rsyncd.conf(5) man page for more | |
34 | details. | |
35 | ||
36 | @@ -648,7 +648,7 @@ | |
37 | in conjunction with the --config option. | |
cbdb69ef | 38 | |
9def7c32 | 39 | dit(bf(--config=FILE)) This specifies an alternate config file than |
e1dcc2c2 | 40 | -the default /etc/rsyncd.conf. This is only relevant when --daemon is |
41 | +the default /etc/rsyncd/rsyncd.conf. This is only relevant when --daemon is | |
9def7c32 AM |
42 | specified. |
43 | ||
44 | dit(bf(--port=PORT)) This specifies an alternate TCP port number to use | |
13dec03c | 45 | @@ -926,7 +926,7 @@ |
9def7c32 AM |
46 | |
47 | manpagefiles() | |
48 | ||
e1dcc2c2 | 49 | -/etc/rsyncd.conf |
50 | +/etc/rsyncd/rsyncd.conf | |
9def7c32 AM |
51 | |
52 | manpageseealso() | |
53 | ||
13dec03c | 54 | --- rsync-2.5.2/rsyncd.conf.5.orig Fri Aug 31 10:12:35 2001 |
55 | +++ rsync-2.5.2/rsyncd.conf.5 Sat Jan 26 07:13:23 2002 | |
56 | @@ -64,7 +64,7 @@ | |
9def7c32 AM |
57 | and a single line something like this to /etc/inetd\&.conf: |
58 | .PP | |
59 | .RS | |
e1dcc2c2 | 60 | -rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon |
61 | +rsync stream tcp nowait root /usr/sbin/rsync rsyncd --daemon | |
9def7c32 AM |
62 | .RE |
63 | .PP | |
cbdb69ef | 64 | Replace "/usr/bin/rsync" with the path to where you have rsync installed on |
13dec03c | 65 | @@ -72,7 +72,7 @@ |
cbdb69ef | 66 | reread its config file\&. |
9def7c32 AM |
67 | .PP |
68 | Note that you should not send the rsync server a HUP signal to force | |
e1dcc2c2 | 69 | -it to reread the \f(CW/etc/rsyncd\&.conf\fP\&. The file is re-read on each client |
70 | +it to reread the \f(CW/etc/rsyncd/rsyncd\etc/rsyncd\&.conf.conf\fP\&. The file is re-read on each client | |
9def7c32 AM |
71 | connection\&. |
72 | .PP | |
73 | .SH "GLOBAL OPTIONS" | |
13dec03c | 74 | @@ -134,7 +134,7 @@ |
9def7c32 AM |
75 | .IP "\fBpath\fP" |
76 | The "path" option specifies the directory in the servers | |
77 | filesystem to make available in this module\&. You must specify this option | |
e1dcc2c2 | 78 | -for each module in \f(CW/etc/rsyncd\&.conf\fP\&. |
79 | +for each module in \f(CW/etc/rsyncd/rsyncd\&.conf\fP\&. | |
9def7c32 AM |
80 | .IP |
81 | .IP "\fBuse chroot\fP" | |
82 | If "use chroot" is true, the rsync server will chroot | |
13dec03c | 83 | @@ -250,7 +250,7 @@ |
9def7c32 AM |
84 | you may find that passwords longer than 8 characters don\'t work\&. |
85 | .IP | |
86 | There is no default for the "secrets file" option, you must choose a name | |
13dec03c | 87 | -(such as \f(CW/etc/rsyncd\&.secrets\fP)\&. The file must normally not be readable |
88 | +(such as \f(CW/etc/rsyncd/rsyncd\&.secrets\fP)\&. The file must normally not be readable | |
89 | by "other"; see "strict modes"\&. | |
9def7c32 AM |
90 | .IP |
91 | .IP "\fBstrict modes\fP" | |
13dec03c | 92 | @@ -481,13 +481,13 @@ |
9def7c32 AM |
93 | path = /data/cvs |
94 | comment = CVS repository (requires authentication) | |
95 | auth users = tridge, susan | |
e1dcc2c2 | 96 | - secrets file = /etc/rsyncd\&.secrets |
97 | + secrets file = /etc/rsyncd/rsyncd\&.secrets | |
9def7c32 | 98 | |
13dec03c | 99 | .fi |
9def7c32 AM |
100 | |
101 | ||
102 | .PP | |
e1dcc2c2 | 103 | -The /etc/rsyncd\&.secrets file would look something like this: |
104 | +The /etc/rsyncd/rsyncd\&.secrets file would look something like this: | |
9def7c32 AM |
105 | .PP |
106 | tridge:mypass | |
107 | .br | |
13dec03c | 108 | @@ -495,7 +495,7 @@ |
9def7c32 AM |
109 | .PP |
110 | .SH "FILES" | |
111 | .PP | |
e1dcc2c2 | 112 | -/etc/rsyncd\&.conf |
113 | +/etc/rsyncd/rsyncd\&.conf | |
9def7c32 AM |
114 | .PP |
115 | .SH "SEE ALSO" | |
116 | .PP | |
13dec03c | 117 | --- rsync-2.5.2/rsyncd.conf.yo.orig Fri Aug 31 10:12:35 2001 |
118 | +++ rsync-2.5.2/rsyncd.conf.yo Sat Jan 26 07:14:48 2002 | |
119 | @@ -61,14 +61,14 @@ | |
9def7c32 AM |
120 | |
121 | and a single line something like this to /etc/inetd.conf: | |
122 | ||
e1dcc2c2 | 123 | -quote(rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon) |
124 | +quote(rsync stream tcp nowait root /usr/sbin/rsync rsyncd --daemon) | |
9def7c32 | 125 | |
cbdb69ef | 126 | Replace "/usr/bin/rsync" with the path to where you have rsync installed on |
127 | your system. You will then need to send inetd a HUP signal to tell it to | |
128 | reread its config file. | |
9def7c32 AM |
129 | |
130 | Note that you should not send the rsync server a HUP signal to force | |
e1dcc2c2 | 131 | -it to reread the tt(/etc/rsyncd.conf). The file is re-read on each client |
132 | +it to reread the tt(/etc/rsyncd/rsyncd.conf). The file is re-read on each client | |
9def7c32 AM |
133 | connection. |
134 | ||
135 | manpagesection(GLOBAL OPTIONS) | |
13dec03c | 136 | @@ -127,7 +127,7 @@ |
9def7c32 AM |
137 | |
138 | dit(bf(path)) The "path" option specifies the directory in the servers | |
139 | filesystem to make available in this module. You must specify this option | |
e1dcc2c2 | 140 | -for each module in tt(/etc/rsyncd.conf). |
141 | +for each module in tt(/etc/rsyncd/rsyncd.conf). | |
9def7c32 AM |
142 | |
143 | dit(bf(use chroot)) If "use chroot" is true, the rsync server will chroot | |
144 | to the "path" before starting the file transfer with the client. This has | |
13dec03c | 145 | @@ -230,7 +230,7 @@ |
9def7c32 AM |
146 | you may find that passwords longer than 8 characters don't work. |
147 | ||
148 | There is no default for the "secrets file" option, you must choose a name | |
13dec03c | 149 | -(such as tt(/etc/rsyncd.secrets)). The file must normally not be readable |
150 | +(such as tt(/etc/rsyncd/rsyncd.secrets)). The file must normally not be readable | |
151 | by "other"; see "strict modes". | |
9def7c32 AM |
152 | |
153 | dit(bf(strict modes)) The "strict modes" option determines whether or not | |
13dec03c | 154 | @@ -420,17 +420,17 @@ |
9def7c32 AM |
155 | path = /data/cvs |
156 | comment = CVS repository (requires authentication) | |
157 | auth users = tridge, susan | |
e1dcc2c2 | 158 | - secrets file = /etc/rsyncd.secrets |
159 | + secrets file = /etc/rsyncd/rsyncd.secrets | |
9def7c32 AM |
160 | ) |
161 | ||
e1dcc2c2 | 162 | -The /etc/rsyncd.secrets file would look something like this: |
163 | +The /etc/rsyncd/rsyncd.secrets file would look something like this: | |
9def7c32 AM |
164 | |
165 | tridge:mypass nl() | |
166 | susan:herpass | |
167 | ||
168 | manpagefiles() | |
169 | ||
e1dcc2c2 | 170 | -/etc/rsyncd.conf |
171 | +/etc/rsyncd/rsyncd.conf | |
9def7c32 AM |
172 | |
173 | manpageseealso() | |
174 | ||
e1dcc2c2 | 175 | diff -ruN rsync-2.3.2/rsyncstats rsync-2.3.2-new/rsyncstats |
176 | --- rsync-2.3.2/rsyncstats Wed Nov 25 17:24:40 1998 | |
177 | +++ rsync-2.3.2-new/rsyncstats Fri Nov 19 17:51:35 1999 | |
9def7c32 AM |
178 | @@ -23,7 +23,7 @@ |
179 | # --------------------------------------------------------------------------- | |
180 | ||
181 | # edit the next line to customize for your default log file | |
e1dcc2c2 | 182 | -$usage_file = "/var/adm/rsyncd.log"; |
183 | +$usage_file = "/var/log/rsyncd"; | |
9def7c32 AM |
184 | |
185 | # Edit the following lines for default report settings. | |
186 | # Entries defined here will be over-ridden by the command line. |