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