1 diff -burN rsync-2.6.2.orig/rsyncd.conf.5 rsync-2.6.2/rsyncd.conf.5
2 --- rsync-2.6.2.orig/rsyncd.conf.5 2004-05-02 10:20:23.157077408 +0200
3 +++ rsync-2.6.2/rsyncd.conf.5 2004-05-02 11:11:53.624254984 +0200
5 you may find that passwords longer than 8 characters don\&'t work\&.
7 There is no default for the "secrets file" option, you must choose a name
8 -(such as \f(CW/etc/rsyncd\&.secrets\fP)\&. The file must normally not be readable
9 +(such as \f(CW/etc/rsyncd/rsyncd\&.secrets\fP)\&. The file must normally not be readable
10 by "other"; see "strict modes"\&.
12 .IP "\fBstrict modes\fP"
15 comment = CVS repository (requires authentication)
16 auth users = tridge, susan
17 - secrets file = /etc/rsyncd\&.secrets
18 + secrets file = /etc/rsyncd/rsyncd\&.secrets
24 -The /etc/rsyncd\&.secrets file would look something like this:
25 +The /etc/rsyncd/rsyncd\&.secrets file would look something like this:
33 -/etc/rsyncd\&.conf or rsyncd\&.conf
34 +/etc/rsyncd/rsyncd\&.conf or rsyncd\&.conf
38 diff -burN rsync-2.6.2.orig/rsyncd.conf.yo rsync-2.6.2/rsyncd.conf.yo
39 --- rsync-2.6.2.orig/rsyncd.conf.yo 2004-05-02 10:20:23.170075432 +0200
40 +++ rsync-2.6.2/rsyncd.conf.yo 2004-05-02 11:13:07.881966096 +0200
42 reread its config file.
44 Note that you should bf(not) send the rsync daemon a HUP signal to force
45 -it to reread the tt(rsyncd.conf) file. The file is re-read on each client
46 +it to reread the tt(/etc/rsyncd/rsyncd.conf) file. The file is re-read on each client
49 manpagesection(GLOBAL OPTIONS)
52 dit(bf(path)) The "path" option specifies the directory in the daemon's
53 filesystem to make available in this module. You must specify this option
54 -for each module in tt(rsyncd.conf).
55 +for each module in tt(/etc/rsyncd/rsyncd.conf).
57 dit(bf(use chroot)) If "use chroot" is true, the rsync daemon will chroot
58 to the "path" before starting the file transfer with the client. This has
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 tt(/etc/rsyncd.secrets)). The file must normally not be readable
64 +(such as tt(/etc/rsyncd/rsyncd.secrets)). The file must normally not be readable
65 by "other"; see "strict modes".
67 dit(bf(strict modes)) The "strict modes" option determines whether or not
70 comment = CVS repository (requires authentication)
71 auth users = tridge, susan
72 - secrets file = /etc/rsyncd.secrets
73 + secrets file = /etc/rsyncd/rsyncd.secrets
76 -The /etc/rsyncd.secrets file would look something like this:
77 +The /etc/rsyncd/rsyncd.secrets file would look something like this:
81 diff -burN rsync-2.6.2.orig/rsync.h rsync-2.6.2/rsync.h
82 --- rsync-2.6.2.orig/rsync.h 2004-05-02 10:20:23.165076192 +0200
83 +++ rsync-2.6.2/rsync.h 2004-05-02 10:29:51.993601112 +0200
85 /* RSYNCD_SYSCONF is now set in config.h */
86 #define RSYNCD_USERCONF "rsyncd.conf"
88 -#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
89 +#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
90 #define URL_PREFIX "rsync://"
92 #define BACKUP_SUFFIX "~"
93 diff -burN rsync-2.6.2.orig/rsyncstats rsync-2.6.2/rsyncstats
94 --- rsync-2.6.2.orig/support/rsyncstats 2004-05-02 10:20:23.170075432 +0200
95 +++ rsync-2.6.2/support/rsyncstats 2004-05-02 11:13:25.761248032 +0200
99 # You may wish to edit the next line to customize for your default log file.
100 -$usage_file = "/var/adm/rsyncd.log";
101 +$usage_file = "/var/log/rsyncd.log";
103 # Edit the following lines for default report settings.
104 # Entries defined here will be over-ridden by the command line.
105 diff -burN rsync-2.6.2.orig/rsync.yo rsync-2.6.2/rsync.yo
106 --- rsync-2.6.2.orig/rsync.yo 2004-05-02 10:20:23.163076496 +0200
107 +++ rsync-2.6.2/rsync.yo 2004-05-02 11:10:50.675824600 +0200
110 An rsync server is configured using a configuration file. Please see the
111 rsyncd.conf(5) man page for more information. By default the configuration
112 -file is called /etc/rsyncd.conf, unless rsync is running over a remote
113 +file is called /etc/rsyncd/rsyncd.conf, unless rsync is running over a remote
114 shell program and is not running as root; in that case, the default name
115 is rsyncd.conf in the current directory on the remote computer
118 If standard input is a socket then rsync will assume that it is being
119 run via inetd, otherwise it will detach from the current terminal and
120 become a background daemon. The daemon will read the config file
121 -(rsyncd.conf) on each connect made by a client and respond to
122 +(/etc/rsyncd/rsyncd.conf) on each connect made by a client and respond to
123 requests accordingly. See the rsyncd.conf(5) man page for more
126 @@ -1331,7 +1331,7 @@
128 dit(bf(--config=FILE)) This specifies an alternate config file than
129 the default. This is only relevant when bf(--daemon) is specified.
130 -The default is /etc/rsyncd.conf unless the daemon is running over
131 +The default is /etc/rsyncd/rsyncd.conf unless the daemon is running over
132 a remote shell program and the remote user is not root; in that case
133 the default is rsyncd.conf in the current directory (typically $HOME).
135 @@ -2005,7 +2005,7 @@
139 -/etc/rsyncd.conf or rsyncd.conf
140 +/etc/rsyncd/rsyncd.conf or rsyncd.conf