1 diff -Naur rsync-2.5.6-orig/rsync.h rsync-2.5.6/rsync.h
2 --- rsync-2.5.6-orig/rsync.h Sun Jan 26 21:11:16 2003
3 +++ rsync-2.5.6/rsync.h Thu Jan 30 17:39:51 2003
5 #define RSYNC_RSH_ENV "RSYNC_RSH"
7 #define RSYNC_NAME "rsync"
8 -#define RSYNCD_SYSCONF "/etc/rsyncd.conf"
9 +#define RSYNCD_SYSCONF "/etc/rsyncd/rsyncd.conf"
10 #define RSYNCD_USERCONF "rsyncd.conf"
12 -#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
13 +#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
14 #define URL_PREFIX "rsync://"
16 #define BACKUP_SUFFIX "~"
17 diff -Naur rsync-2.5.6-orig/rsync.yo rsync-2.5.6/rsync.yo
18 --- rsync-2.5.6-orig/rsync.yo Tue Jan 28 04:11:57 2003
19 +++ rsync-2.5.6/rsync.yo Thu Jan 30 17:42:31 2003
22 An rsync server is configured using a config file. Please see the
23 rsyncd.conf(5) man page for more information. By default the configuration
24 -file is called /etc/rsyncd.conf, unless rsync is running over a remote
25 +file is called /etc/rsyncd/rsyncd.conf, unless rsync is running over a remote
26 shell program and is not running as root; in that case, the default name
27 is rsyncd.conf in the current directory on the remote computer
30 If standard input is a socket then rsync will assume that it is being
31 run via inetd, otherwise it will detach from the current terminal and
32 become a background daemon. The daemon will read the config file
33 -(rsyncd.conf) on each connect made by a client and respond to
34 +(/etc/rsyncd/rsyncd.conf) on each connect made by a client and respond to
35 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. This is only relevant when --daemon is specified.
42 -The default is /etc/rsyncd.conf unless the daemon is running over
43 +The default is /etc/rsyncd/rsyncd.conf unless the daemon is running over
44 a remote shell program and the remote user is not root; in that case
45 the default is rsyncd.conf in the current directory (typically $HOME).
51 -/etc/rsyncd.conf or rsyncd.conf
52 +/etc/rsyncd/rsyncd.conf or rsyncd.conf
56 diff -Naur rsync-2.5.6-orig/rsyncd.conf.5 rsync-2.5.6/rsyncd.conf.5
57 --- rsync-2.5.6-orig/rsyncd.conf.5 Mon Jan 27 04:07:18 2003
58 +++ rsync-2.5.6/rsyncd.conf.5 Thu Jan 30 17:46:11 2003
60 you may find that passwords longer than 8 characters don\'t work\&.
62 There is no default for the "secrets file" option, you must choose a name
63 -(such as \f(CW/etc/rsyncd\&.secrets\fP)\&. The file must normally not be readable
64 +(such as \f(CW/etc/rsyncd/rsyncd\&.secrets\fP)\&. The file must normally not be readable
65 by "other"; see "strict modes"\&.
67 .IP "\fBstrict modes\fP"
70 comment = CVS repository (requires authentication)
71 auth users = tridge, susan
72 - secrets file = /etc/rsyncd\&.secrets
73 + secrets file = /etc/rsyncd/rsyncd\&.secrets
79 -The /etc/rsyncd\&.secrets file would look something like this:
80 +The /etc/rsyncd/rsyncd\&.secrets file would look something like this:
88 -/etc/rsyncd\&.conf or rsyncd\&.conf
89 +/etc/rsyncd/rsyncd\&.conf or rsyncd\&.conf
93 diff -Naur rsync-2.5.6-orig/rsyncd.conf.yo rsync-2.5.6/rsyncd.conf.yo
94 --- rsync-2.5.6-orig/rsyncd.conf.yo Mon Jan 27 04:07:18 2003
95 +++ rsync-2.5.6/rsyncd.conf.yo Thu Jan 30 17:48:52 2003
97 reread its config file.
99 Note that you should not send the rsync server a HUP signal to force
100 -it to reread the tt(rsyncd.conf) file. The file is re-read on each client
101 +it to reread the tt(/etc/rsyncd/rsyncd.conf) file. The file is re-read on each client
104 manpagesection(GLOBAL OPTIONS)
107 dit(bf(path)) The "path" option specifies the directory in the servers
108 filesystem to make available in this module. You must specify this option
109 -for each module in tt(rsyncd.conf).
110 +for each module in tt(/etc/rsyncd/rsyncd.conf).
112 dit(bf(use chroot)) If "use chroot" is true, the rsync server will chroot
113 to the "path" before starting the file transfer with the client. This has
115 you may find that passwords longer than 8 characters don't work.
117 There is no default for the "secrets file" option, you must choose a name
118 -(such as tt(/etc/rsyncd.secrets)). The file must normally not be readable
119 +(such as tt(/etc/rsyncd/rsyncd.secrets)). The file must normally not be readable
120 by "other"; see "strict modes".
122 dit(bf(strict modes)) The "strict modes" option determines whether or not
123 @@ -437,17 +437,17 @@
125 comment = CVS repository (requires authentication)
126 auth users = tridge, susan
127 - secrets file = /etc/rsyncd.secrets
128 + secrets file = /etc/rsyncd/rsyncd.secrets
131 -The /etc/rsyncd.secrets file would look something like this:
132 +The /etc/rsyncd/rsyncd.secrets file would look something like this:
139 -/etc/rsyncd.conf or rsyncd.conf
140 +/etc/rsyncd/rsyncd.conf or rsyncd.conf
144 diff -Naur rsync-2.5.6-orig/rsyncstats rsync-2.5.6/rsyncstats
145 --- rsync-2.5.6-orig/rsyncstats Mon Nov 23 01:30:27 1998
146 +++ rsync-2.5.6/rsyncstats Thu Jan 30 17:50:17 2003
148 # ---------------------------------------------------------------------------
150 # edit the next line to customize for your default log file
151 -$usage_file = "/var/adm/rsyncd.log";
152 +$usage_file = "/var/log/rsyncd";
154 # Edit the following lines for default report settings.
155 # Entries defined here will be over-ridden by the command line.