]>
Commit | Line | Data |
---|---|---|
697fec4c AG |
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 | |
4 | @@ -282,7 +282,7 @@ | |
5 | you may find that passwords longer than 8 characters don\&'t work\&. | |
9def7c32 AM |
6 | .IP |
7 | There is no default for the "secrets file" option, you must choose a name | |
13dec03c | 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"\&. | |
9def7c32 AM |
11 | .IP |
12 | .IP "\fBstrict modes\fP" | |
697fec4c | 13 | @@ -557,13 +557,13 @@ |
9def7c32 AM |
14 | path = /data/cvs |
15 | comment = CVS repository (requires authentication) | |
16 | auth users = tridge, susan | |
e1dcc2c2 | 17 | - secrets file = /etc/rsyncd\&.secrets |
18 | + secrets file = /etc/rsyncd/rsyncd\&.secrets | |
9def7c32 | 19 | |
13dec03c | 20 | .fi |
9def7c32 AM |
21 | |
22 | ||
23 | .PP | |
e1dcc2c2 | 24 | -The /etc/rsyncd\&.secrets file would look something like this: |
25 | +The /etc/rsyncd/rsyncd\&.secrets file would look something like this: | |
9def7c32 AM |
26 | .PP |
27 | tridge:mypass | |
28 | .br | |
697fec4c | 29 | @@ -571,7 +571,7 @@ |
9def7c32 AM |
30 | .PP |
31 | .SH "FILES" | |
32 | .PP | |
c9a2c537 MW |
33 | -/etc/rsyncd\&.conf or rsyncd\&.conf |
34 | +/etc/rsyncd/rsyncd\&.conf or rsyncd\&.conf | |
9def7c32 AM |
35 | .PP |
36 | .SH "SEE ALSO" | |
37 | .PP | |
697fec4c AG |
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 | |
c9a2c537 | 41 | @@ -69,7 +69,7 @@ |
cbdb69ef | 42 | reread its config file. |
9def7c32 AM |
43 | |
44 | Note that you should not send the rsync server a HUP signal to force | |
c9a2c537 MW |
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 | |
9def7c32 AM |
47 | connection. |
48 | ||
49 | manpagesection(GLOBAL OPTIONS) | |
c9a2c537 | 50 | @@ -128,7 +128,7 @@ |
9def7c32 AM |
51 | |
52 | dit(bf(path)) The "path" option specifies the directory in the servers | |
53 | filesystem to make available in this module. You must specify this option | |
c9a2c537 | 54 | -for each module in tt(rsyncd.conf). |
e1dcc2c2 | 55 | +for each module in tt(/etc/rsyncd/rsyncd.conf). |
9def7c32 AM |
56 | |
57 | dit(bf(use chroot)) If "use chroot" is true, the rsync server will chroot | |
58 | to the "path" before starting the file transfer with the client. This has | |
697fec4c | 59 | @@ -262,7 +262,7 @@ |
9def7c32 AM |
60 | you may find that passwords longer than 8 characters don't work. |
61 | ||
62 | There is no default for the "secrets file" option, you must choose a name | |
13dec03c | 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". | |
9def7c32 AM |
66 | |
67 | dit(bf(strict modes)) The "strict modes" option determines whether or not | |
697fec4c | 68 | @@ -486,17 +486,17 @@ |
9def7c32 AM |
69 | path = /data/cvs |
70 | comment = CVS repository (requires authentication) | |
71 | auth users = tridge, susan | |
e1dcc2c2 | 72 | - secrets file = /etc/rsyncd.secrets |
73 | + secrets file = /etc/rsyncd/rsyncd.secrets | |
9def7c32 AM |
74 | ) |
75 | ||
e1dcc2c2 | 76 | -The /etc/rsyncd.secrets file would look something like this: |
77 | +The /etc/rsyncd/rsyncd.secrets file would look something like this: | |
9def7c32 AM |
78 | |
79 | tridge:mypass nl() | |
80 | susan:herpass | |
81 | ||
82 | manpagefiles() | |
83 | ||
c9a2c537 MW |
84 | -/etc/rsyncd.conf or rsyncd.conf |
85 | +/etc/rsyncd/rsyncd.conf or rsyncd.conf | |
9def7c32 AM |
86 | |
87 | manpageseealso() | |
88 | ||
697fec4c AG |
89 | diff -burN rsync-2.6.2.orig/rsync.h rsync-2.6.2/rsync.h |
90 | --- rsync-2.6.2.orig/rsync.h 2004-05-02 10:20:23.165076192 +0200 | |
91 | +++ rsync-2.6.2/rsync.h 2004-05-02 10:29:51.993601112 +0200 | |
92 | @@ -30,7 +30,7 @@ | |
93 | /* RSYNCD_SYSCONF is now set in config.h */ | |
94 | #define RSYNCD_USERCONF "rsyncd.conf" | |
95 | ||
96 | -#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" | |
97 | +#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock" | |
98 | #define URL_PREFIX "rsync://" | |
99 | ||
100 | #define BACKUP_SUFFIX "~" | |
101 | diff -burN rsync-2.6.2.orig/rsyncstats rsync-2.6.2/rsyncstats | |
102 | --- rsync-2.6.2.orig/rsyncstats 2004-05-02 10:20:23.170075432 +0200 | |
103 | +++ rsync-2.6.2/rsyncstats 2004-05-02 11:13:25.761248032 +0200 | |
9def7c32 AM |
104 | @@ -23,7 +23,7 @@ |
105 | # --------------------------------------------------------------------------- | |
106 | ||
107 | # edit the next line to customize for your default log file | |
e1dcc2c2 | 108 | -$usage_file = "/var/adm/rsyncd.log"; |
697fec4c | 109 | +$usage_file = "/var/log/rsyncd.log"; |
9def7c32 AM |
110 | |
111 | # Edit the following lines for default report settings. | |
112 | # Entries defined here will be over-ridden by the command line. | |
697fec4c AG |
113 | diff -burN rsync-2.6.2.orig/rsync.yo rsync-2.6.2/rsync.yo |
114 | --- rsync-2.6.2.orig/rsync.yo 2004-05-02 10:20:23.163076496 +0200 | |
115 | +++ rsync-2.6.2/rsync.yo 2004-05-02 11:10:50.675824600 +0200 | |
116 | @@ -219,7 +219,7 @@ | |
117 | ||
118 | An rsync server is configured using a configuration file. Please see the | |
119 | rsyncd.conf(5) man page for more information. By default the configuration | |
120 | -file is called /etc/rsyncd.conf, unless rsync is running over a remote | |
121 | +file is called /etc/rsyncd/rsyncd.conf, unless rsync is running over a remote | |
122 | shell program and is not running as root; in that case, the default name | |
123 | is rsyncd.conf in the current directory on the remote computer | |
124 | (typically $HOME). | |
125 | @@ -790,7 +790,7 @@ | |
126 | If standard input is a socket then rsync will assume that it is being | |
127 | run via inetd, otherwise it will detach from the current terminal and | |
128 | become a background daemon. The daemon will read the config file | |
129 | -(rsyncd.conf) on each connect made by a client and respond to | |
130 | +(/etc/rsyncd/rsyncd.conf) on each connect made by a client and respond to | |
131 | requests accordingly. See the rsyncd.conf(5) man page for more | |
132 | details. | |
133 | ||
134 | @@ -811,7 +811,7 @@ | |
135 | ||
136 | dit(bf(--config=FILE)) This specifies an alternate config file than | |
137 | the default. This is only relevant when --daemon is specified. | |
138 | -The default is /etc/rsyncd.conf unless the daemon is running over | |
139 | +The default is /etc/rsyncd/rsyncd.conf unless the daemon is running over | |
140 | a remote shell program and the remote user is not root; in that case | |
141 | the default is rsyncd.conf in the current directory (typically $HOME). | |
142 | ||
143 | @@ -1258,7 +1258,7 @@ | |
144 | ||
145 | manpagefiles() | |
146 | ||
147 | -/etc/rsyncd.conf or rsyncd.conf | |
148 | +/etc/rsyncd/rsyncd.conf or rsyncd.conf | |
149 | ||
150 | manpageseealso() | |
151 |