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
5 #define RSYNC_RSH_ENV "RSYNC_RSH"
7 #define RSYNC_NAME "rsync"
8 -#define RSYNCD_CONF "/etc/rsyncd.conf"
9 +#define RSYNCD_CONF "/etc/rsyncd/rsyncd.conf"
11 -#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
12 +#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
13 #define URL_PREFIX "rsync://"
15 #define BACKUP_SUFFIX "~"
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
20 manpagesection(RUNNING AN RSYNC SERVER)
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
27 manpagesection(EXAMPLES)
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
40 dit(bf(--config=FILE)) This specifies an alternate config file than
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
45 dit(bf(--port=PORT)) This specifies an alternate TCP port number to use
51 +/etc/rsyncd/rsyncd.conf
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
59 and a single line something like this to /etc/inetd\&.conf:
62 -rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon
63 +rsync stream tcp nowait root /usr/sbin/rsync rsyncd --daemon
66 Replace "/usr/bin/rsync" with the path to where you have rsync installed on
68 reread its config file\&.
70 Note that you should not send the rsync server a HUP signal to force
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
78 The "path" option specifies the directory in the servers
79 filesystem to make available in this module\&. You must specify this option
80 -for each module in \f(CW/etc/rsyncd\&.conf\fP\&.
81 +for each module in \f(CW/etc/rsyncd/rsyncd\&.conf\fP\&.
83 .IP "\fBuse chroot\fP"
84 If "use chroot" is true, the rsync server will chroot
86 you may find that passwords longer than 8 characters don\'t work\&.
88 There is no default for the "secrets file" option, you must choose a name
89 -(such as \f(CW/etc/rsyncd\&.secrets\fP)\&.
90 +(such as \f(CW/etc/rsyncd/rsyncd\&.secrets\fP)\&.
92 .IP "\fBstrict modes\fP"
93 The "strict modes" option determines whether or not
96 syslog facility = local5
98 -pid file = /etc/rsyncd\&.pid
99 +pid file = /var/run/rsyncd\&.pid
103 @@ -464,13 +464,13 @@
105 comment = CVS repository (requires authentication)
106 auth users = tridge, susan
107 - secrets file = /etc/rsyncd\&.secrets
108 + secrets file = /etc/rsyncd/rsyncd\&.secrets
114 -The /etc/rsyncd\&.secrets file would look something like this:
115 +The /etc/rsyncd/rsyncd\&.secrets file would look something like this:
124 +/etc/rsyncd/rsyncd\&.conf
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
133 and a single line something like this to /etc/inetd.conf:
135 -quote(rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon)
136 +quote(rsync stream tcp nowait root /usr/sbin/rsync rsyncd --daemon)
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.
142 Note that you should not send the rsync server a HUP signal to force
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
147 manpagesection(GLOBAL OPTIONS)
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
152 -for each module in tt(/etc/rsyncd.conf).
153 +for each module in tt(/etc/rsyncd/rsyncd.conf).
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
158 you may find that passwords longer than 8 characters don't work.
160 There is no default for the "secrets file" option, you must choose a name
161 -(such as tt(/etc/rsyncd.secrets)).
162 +(such as tt(/etc/rsyncd/rsyncd.secrets)).
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
168 max connections = 4 nl()
169 syslog facility = local5 nl()
170 -pid file = /etc/rsyncd.pid
171 +pid file = /var/run/rsyncd.pid
175 @@ -404,17 +404,17 @@
177 comment = CVS repository (requires authentication)
178 auth users = tridge, susan
179 - secrets file = /etc/rsyncd.secrets
180 + secrets file = /etc/rsyncd/rsyncd.secrets
183 -The /etc/rsyncd.secrets file would look something like this:
184 +The /etc/rsyncd/rsyncd.secrets file would look something like this:
192 +/etc/rsyncd/rsyncd.conf
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
200 # ---------------------------------------------------------------------------
202 # edit the next line to customize for your default log file
203 -$usage_file = "/var/adm/rsyncd.log";
204 +$usage_file = "/var/log/rsyncd";
206 # Edit the following lines for default report settings.
207 # Entries defined here will be over-ridden by the command line.