]>
Commit | Line | Data |
---|---|---|
7460d227 AM |
1 | diff -ur rsync-3.0.8.orig/rsync.h rsync-3.0.8/rsync.h |
2 | --- rsync-3.0.8.orig/rsync.h 2011-02-21 20:32:51.000000000 +0100 | |
3 | +++ rsync-3.0.8/rsync.h 2011-04-07 10:21:07.794002236 +0200 | |
4 | @@ -29,7 +29,7 @@ | |
5 | /* RSYNCD_SYSCONF is now set in config.h */ | |
6 | #define RSYNCD_USERCONF "rsyncd.conf" | |
7 | ||
8 | -#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" | |
9 | +#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock" | |
10 | #define URL_PREFIX "rsync://" | |
11 | ||
12 | #define SYMLINK_PREFIX "/rsyncd-munged/" /* This MUST have a trailing slash! */ | |
3f874dbe JB |
13 | --- rsync-3.2.3/rsync.1.orig 2020-08-07 05:57:26.000000000 +0200 |
14 | +++ rsync-3.2.3/rsync.1 2020-08-16 14:32:06.591094708 +0200 | |
15 | @@ -3423,7 +3423,7 @@ | |
16 | version of this option (above) for some extra details. | |
17 | .IP "\fB\-\-config=FILE\fP" | |
18 | This specifies an alternate config file than the default. This is only | |
19 | -relevant when \fB\-\-daemon\fP is specified. The default is /etc/rsyncd.conf | |
20 | +relevant when \fB\-\-daemon\fP is specified. The default is /etc/rsyncd/rsyncd.conf | |
21 | unless the daemon is running over a remote shell program and the remote | |
22 | user is not the super-user; in that case the default is rsyncd.conf in the | |
23 | current directory (typically $HOME). | |
24 | @@ -4260,7 +4260,7 @@ | |
25 | .P | |
26 | .SH "FILES" | |
27 | .P | |
28 | -/etc/rsyncd.conf or rsyncd.conf | |
29 | +/etc/rsyncd/rsyncd.conf or rsyncd.conf | |
30 | .P | |
31 | .SH "SEE ALSO" | |
32 | .P | |
33 | --- rsync-3.2.3/rsync.1.md.orig 2020-07-28 00:56:48.000000000 +0200 | |
34 | +++ rsync-3.2.3/rsync.1.md 2020-08-16 14:33:28.887315538 +0200 | |
35 | @@ -3380,7 +3380,7 @@ | |
36 | 0. `--config=FILE` | |
37 | ||
38 | This specifies an alternate config file than the default. This is only | |
39 | - relevant when `--daemon` is specified. The default is /etc/rsyncd.conf | |
40 | + relevant when `--daemon` is specified. The default is /etc/rsyncd/rsyncd.conf | |
41 | unless the daemon is running over a remote shell program and the remote | |
42 | user is not the super-user; in that case the default is rsyncd.conf in the | |
43 | current directory (typically $HOME). | |
44 | @@ -4117,7 +4117,7 @@ | |
45 | ||
46 | # FILES | |
47 | ||
48 | -/etc/rsyncd.conf or rsyncd.conf | |
49 | +/etc/rsyncd/rsyncd.conf or rsyncd.conf | |
50 | ||
51 | # SEE ALSO | |
52 | ||
53 | --- rsync-3.2.3/rsyncd.conf.5.orig 2020-08-07 05:57:26.000000000 +0200 | |
54 | +++ rsync-3.2.3/rsyncd.conf.5 2020-08-16 18:54:27.322486513 +0200 | |
55 | @@ -393,7 +393,7 @@ | |
56 | This parameter specifies the file to use to support the "max connections" | |
57 | parameter. The rsync daemon uses record locking on this file to ensure that | |
58 | the max connections limit is not exceeded for the modules sharing the lock | |
59 | -file. The default is \fB/var/run/rsyncd.lock\fP. | |
60 | +file. The default is \fB/var/lock/rsyncd.lock\fP. | |
61 | .IP "\fBread\ only\fP" | |
62 | This parameter determines whether clients will be able to upload files or | |
63 | not. If "read only" is true then any attempted uploads will fail. If | |
64 | @@ -632,7 +632,7 @@ | |
8c313d6a | 65 | passwords. |
9a0f13f9 AM |
66 | .IP |
67 | There is no default for the "secrets file" parameter, you must choose a | |
68 | -name (such as \fB/etc/rsyncd.secrets\fP). The file must normally not be | |
69 | +name (such as \fB/etc/rsyncd/rsyncd.secrets\fP). The file must normally not be | |
70 | readable by "other"; see "strict modes". If the file is not found or is | |
71 | rejected, no logins for a "user auth" module will be possible. | |
72 | .IP "\fBstrict\ modes\fP" | |
3f874dbe | 73 | @@ -1092,7 +1092,7 @@ |
9a0f13f9 AM |
74 | global values that will affect connections (such as \fBmotd\ file\fP), or globals |
75 | that will affect other include files. | |
76 | .P | |
77 | -For example, this is a useful /etc/rsyncd.conf file: | |
78 | +For example, this is a useful /etc/rsyncd/rsyncd.conf file: | |
79 | .RS 4 | |
80 | .P | |
81 | .nf | |
3f874dbe JB |
82 | @@ -1100,13 +1100,13 @@ |
83 | log file = /var/log/rsync.log | |
84 | pid file = /var/lock/rsync.lock | |
85 | ||
86 | -&merge /etc/rsyncd.d | |
87 | -&include /etc/rsyncd.d | |
88 | +&merge /etc/rsyncd/rsyncd.d | |
89 | +&include /etc/rsyncd/rsyncd.d | |
90 | .fi | |
91 | .RE | |
92 | .P | |
93 | -This would merge any \fB/etc/rsyncd.d/*.inc\fP files (for global values that should | |
94 | -stay in effect), and then include any \fB/etc/rsyncd.d/*.conf\fP files (defining | |
95 | +This would merge any \fB/etc/rsyncd/rsyncd.d/*.inc\fP files (for global values that should | |
96 | +stay in effect), and then include any \fB/etc/rsyncd/rsyncd.d/*.conf\fP files (defining | |
97 | modules without any global-value cross-talk). | |
98 | .P | |
99 | .SH "AUTHENTICATION STRENGTH" | |
100 | @@ -1219,11 +1219,11 @@ | |
9def7c32 AM |
101 | path = /data/cvs |
102 | comment = CVS repository (requires authentication) | |
103 | auth users = tridge, susan | |
7fee9aef AM |
104 | - secrets file = /etc/rsyncd.secrets |
105 | + secrets file = /etc/rsyncd/rsyncd.secrets | |
9a0f13f9 AM |
106 | .fi |
107 | .RE | |
108 | .P | |
7fee9aef AM |
109 | -The /etc/rsyncd.secrets file would look something like this: |
110 | +The /etc/rsyncd/rsyncd.secrets file would look something like this: | |
9a0f13f9 AM |
111 | .RS 4 |
112 | .P | |
113 | .nf | |
3f874dbe | 114 | @@ -1234,7 +1234,7 @@ |
9a0f13f9 | 115 | .P |
7fee9aef | 116 | .SH "FILES" |
9a0f13f9 | 117 | .P |
7fee9aef AM |
118 | -/etc/rsyncd.conf or rsyncd.conf |
119 | +/etc/rsyncd/rsyncd.conf or rsyncd.conf | |
9a0f13f9 | 120 | .P |
7fee9aef | 121 | .SH "SEE ALSO" |
9a0f13f9 | 122 | .P |
3f874dbe JB |
123 | --- rsync-3.2.3/rsyncd.conf.5.md.orig 2020-08-16 14:34:12.567078905 +0200 |
124 | +++ rsync-3.2.3/rsyncd.conf.5.md 2020-08-16 18:53:50.806017673 +0200 | |
125 | @@ -417,7 +417,7 @@ | |
126 | This parameter specifies the file to use to support the "max connections" | |
127 | parameter. The rsync daemon uses record locking on this file to ensure that | |
128 | the max connections limit is not exceeded for the modules sharing the lock | |
129 | - file. The default is `/var/run/rsyncd.lock`. | |
130 | + file. The default is `/var/lock/rsyncd.lock`. | |
131 | ||
132 | 0. `read only` | |
133 | ||
134 | @@ -680,7 +680,7 @@ | |
135 | passwords. | |
136 | ||
137 | There is no default for the "secrets file" parameter, you must choose a | |
138 | - name (such as `/etc/rsyncd.secrets`). The file must normally not be | |
139 | + name (such as `/etc/rsyncd/rsyncd.secrets`). The file must normally not be | |
140 | readable by "other"; see "strict modes". If the file is not found or is | |
141 | rejected, no logins for a "user auth" module will be possible. | |
142 | ||
143 | @@ -1075,17 +1075,17 @@ | |
144 | global values that will affect connections (such as `motd file`), or globals | |
145 | that will affect other include files. | |
146 | ||
147 | -For example, this is a useful /etc/rsyncd.conf file: | |
148 | +For example, this is a useful /etc/rsyncd/rsyncd.conf file: | |
149 | ||
150 | > port = 873 | |
151 | > log file = /var/log/rsync.log | |
152 | > pid file = /var/lock/rsync.lock | |
153 | > | |
154 | -> &merge /etc/rsyncd.d | |
155 | -> &include /etc/rsyncd.d | |
156 | +> &merge /etc/rsyncd/rsyncd.d | |
157 | +> &include /etc/rsyncd/rsyncd.d | |
158 | ||
159 | -This would merge any `/etc/rsyncd.d/*.inc` files (for global values that should | |
160 | -stay in effect), and then include any `/etc/rsyncd.d/*.conf` files (defining | |
161 | +This would merge any `/etc/rsyncd/rsyncd.d/*.inc` files (for global values that should | |
162 | +stay in effect), and then include any `/etc/rsyncd/rsyncd.d/*.conf` files (defining | |
163 | modules without any global-value cross-talk). | |
164 | ||
165 | # AUTHENTICATION STRENGTH | |
166 | @@ -1189,17 +1189,17 @@ | |
167 | > path = /data/cvs | |
168 | > comment = CVS repository (requires authentication) | |
169 | > auth users = tridge, susan | |
170 | -> secrets file = /etc/rsyncd.secrets | |
171 | +> secrets file = /etc/rsyncd/rsyncd.secrets | |
172 | > ``` | |
173 | ||
174 | -The /etc/rsyncd.secrets file would look something like this: | |
175 | +The /etc/rsyncd/rsyncd.secrets file would look something like this: | |
176 | ||
177 | > tridge:mypass | |
178 | > susan:herpass | |
179 | ||
180 | # FILES | |
181 | ||
182 | -/etc/rsyncd.conf or rsyncd.conf | |
183 | +/etc/rsyncd/rsyncd.conf or rsyncd.conf | |
184 | ||
185 | # SEE ALSO | |
186 |