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