Annotation of /trunk/proftpd/patches/proftpd-1.3.3-config.patch
Parent Directory | Revision Log
Revision 991 -
(hide annotations)
(download)
Wed Mar 3 19:08:46 2010 UTC (14 years, 6 months ago) by niro
File size: 7645 byte(s)
Wed Mar 3 19:08:46 2010 UTC (14 years, 6 months ago) by niro
File size: 7645 byte(s)
files and updates for proftpd-1.3.3 with optional mysql, ldap, tls and anonymous support
1 | niro | 991 | diff -Naur proftpd-1.3.3/sample-configurations/anonymous.conf proftpd-1.3.3-magellan/sample-configurations/anonymous.conf |
2 | --- proftpd-1.3.3/sample-configurations/anonymous.conf 2007-03-09 20:01:29.000000000 +0100 | ||
3 | +++ proftpd-1.3.3-magellan/sample-configurations/anonymous.conf 2010-03-02 23:18:07.000000000 +0100 | ||
4 | @@ -2,9 +2,19 @@ | ||
5 | # anonymous directories, and a guest (same thing as anonymous but | ||
6 | # requires a valid password to login) | ||
7 | |||
8 | -ServerName "ProFTPD Anonymous Server" | ||
9 | +# Includes DSO modules | ||
10 | +Include /etc/proftpd/modules.conf | ||
11 | + | ||
12 | +ServerName "Magellan Anonymous Server" | ||
13 | ServerType standalone | ||
14 | |||
15 | +DefaultServer on | ||
16 | +MultilineRFC2228 on | ||
17 | +ShowSymlinks on | ||
18 | + | ||
19 | +# Set off to disable IPv6 support which is annoying on IPv4 only boxes. | ||
20 | +UseIPv6 off | ||
21 | + | ||
22 | # Port 21 is the standard FTP port. | ||
23 | Port 21 | ||
24 | |||
25 | @@ -15,8 +25,8 @@ | ||
26 | #</Limit> | ||
27 | |||
28 | # Set the user and group that the server normally runs at. | ||
29 | -User nobody | ||
30 | -Group nogroup | ||
31 | +User proftpd | ||
32 | +Group proftpd | ||
33 | |||
34 | # To prevent DoS attacks, set the maximum number of child processes | ||
35 | # to 30. If you need to allow more than 30 concurrent connections | ||
36 | @@ -35,6 +45,9 @@ | ||
37 | DisplayLogin welcome.msg | ||
38 | DisplayChdir .message | ||
39 | |||
40 | +TransferLog /var/log/proftpd/xferlog | ||
41 | +SystemLog /var/log/proftpd/proftpd.log | ||
42 | + | ||
43 | # Our "basic" anonymous configuration, including a single | ||
44 | # upload directory ("uploads") | ||
45 | <Anonymous ~ftp> | ||
46 | diff -Naur proftpd-1.3.3/sample-configurations/basic.conf proftpd-1.3.3-magellan/sample-configurations/basic.conf | ||
47 | --- proftpd-1.3.3/sample-configurations/basic.conf 2008-01-21 18:44:06.000000000 +0100 | ||
48 | +++ proftpd-1.3.3-magellan/sample-configurations/basic.conf 2010-03-02 23:22:09.000000000 +0100 | ||
49 | @@ -1,21 +1,26 @@ | ||
50 | -# This is a basic ProFTPD configuration file (rename it to | ||
51 | -# 'proftpd.conf' for actual use. It establishes a single server | ||
52 | -# and a single anonymous login. It assumes that you have a user/group | ||
53 | -# "nobody" and "ftp" for normal operation and anon. | ||
54 | +# | ||
55 | +# /etc/proftpd/proftpd.conf - basic ProFTPD configuration file. | ||
56 | +# | ||
57 | |||
58 | -ServerName "ProFTPD Default Installation" | ||
59 | +# Includes DSO modules | ||
60 | +Include /etc/proftpd/modules.conf | ||
61 | + | ||
62 | +ServerName "Magellan" | ||
63 | ServerType standalone | ||
64 | + | ||
65 | DefaultServer on | ||
66 | +MultilineRFC2228 on | ||
67 | +ShowSymlinks on | ||
68 | |||
69 | +# Set off to disable IPv6 support which is annoying on IPv4 only boxes. | ||
70 | +UseIPv6 off | ||
71 | + | ||
72 | # Port 21 is the standard FTP port. | ||
73 | Port 21 | ||
74 | |||
75 | -# Don't use IPv6 support by default. | ||
76 | -UseIPv6 off | ||
77 | - | ||
78 | -# Umask 022 is a good standard umask to prevent new dirs and files | ||
79 | -# from being group and world writable. | ||
80 | -Umask 022 | ||
81 | +# Umask 022 is a good standard umask to prevent new files and dirs | ||
82 | +# (seconf parm) from being group and world writable. | ||
83 | +Umask 022 022 | ||
84 | |||
85 | # To prevent DoS attacks, set the maximum number of child processes | ||
86 | # to 30. If you need to allow more than 30 concurrent connections | ||
87 | @@ -26,8 +31,8 @@ | ||
88 | MaxInstances 30 | ||
89 | |||
90 | # Set the user and group under which the server will run. | ||
91 | -User nobody | ||
92 | -Group nogroup | ||
93 | +User proftpd | ||
94 | +Group proftpd | ||
95 | |||
96 | # To cause every FTP user to be "jailed" (chrooted) into their home | ||
97 | # directory, uncomment this line. | ||
98 | @@ -41,25 +46,29 @@ | ||
99 | DenyAll | ||
100 | </Limit> | ||
101 | |||
102 | -# A basic anonymous configuration, no upload directories. If you do not | ||
103 | -# want anonymous users, simply delete this entire <Anonymous> section. | ||
104 | -<Anonymous ~ftp> | ||
105 | - User ftp | ||
106 | - Group ftp | ||
107 | - | ||
108 | - # We want clients to be able to login with "anonymous" as well as "ftp" | ||
109 | - UserAlias anonymous ftp | ||
110 | - | ||
111 | - # Limit the maximum number of anonymous logins | ||
112 | - MaxClients 10 | ||
113 | - | ||
114 | - # We want 'welcome.msg' displayed at login, and '.message' displayed | ||
115 | - # in each newly chdired directory. | ||
116 | - DisplayLogin welcome.msg | ||
117 | - DisplayChdir .message | ||
118 | - | ||
119 | - # Limit WRITE everywhere in the anonymous chroot | ||
120 | - <Limit WRITE> | ||
121 | - DenyAll | ||
122 | - </Limit> | ||
123 | -</Anonymous> | ||
124 | +TransferLog /var/log/proftpd/xferlog | ||
125 | +SystemLog /var/log/proftpd/proftpd.log | ||
126 | + | ||
127 | +# A basic anonymous configuration, no upload directories. | ||
128 | + | ||
129 | +# <Anonymous ~ftp> | ||
130 | +# User ftp | ||
131 | +# Group ftp | ||
132 | +# | ||
133 | +# # We want clients to be able to login with "anonymous" as well as "ftp" | ||
134 | +# UserAlias anonymous ftp | ||
135 | +# | ||
136 | +# # Limit the maximum number of anonymous logins | ||
137 | +# MaxClients 10 | ||
138 | +# | ||
139 | +# # We want 'welcome.msg' displayed at login, and '.message' displayed | ||
140 | +# # in each newly chdired directory. | ||
141 | +# DisplayLogin welcome.msg | ||
142 | +# DisplayFirstChdir .message | ||
143 | +# | ||
144 | +# # Limit WRITE everywhere in the anonymous chroot | ||
145 | +# <Limit WRITE> | ||
146 | +# DenyAll | ||
147 | +# </Limit> | ||
148 | +# </Anonymous> | ||
149 | + | ||
150 | diff -Naur proftpd-1.3.3/sample-configurations/mod_sql.conf proftpd-1.3.3-magellan/sample-configurations/mod_sql.conf | ||
151 | --- proftpd-1.3.3/sample-configurations/mod_sql.conf 2007-04-16 05:07:43.000000000 +0200 | ||
152 | +++ proftpd-1.3.3-magellan/sample-configurations/mod_sql.conf 2010-03-02 23:25:00.000000000 +0100 | ||
153 | @@ -59,16 +59,25 @@ | ||
154 | # block. | ||
155 | |||
156 | |||
157 | -ServerName "ProFTPD Default Installation" | ||
158 | +# Includes DSO modules | ||
159 | +Include /etc/proftpd/modules.conf | ||
160 | + | ||
161 | +ServerName "Magellan SQL Installation" | ||
162 | ServerType standalone | ||
163 | + | ||
164 | DefaultServer on | ||
165 | +MultilineRFC2228 on | ||
166 | +ShowSymlinks on | ||
167 | + | ||
168 | +# Set off to disable IPv6 support which is annoying on IPv4 only boxes. | ||
169 | +UseIPv6 off | ||
170 | |||
171 | # Port 21 is the standard FTP port. | ||
172 | Port 21 | ||
173 | |||
174 | -# Umask 022 is a good standard umask to prevent new dirs and files | ||
175 | -# from being group and world writable. | ||
176 | -Umask 022 | ||
177 | +# Umask 022 is a good standard umask to prevent new files and dirs | ||
178 | +# (second param) from being group and world writable. | ||
179 | +Umask 022 022 | ||
180 | |||
181 | # We put our mod_sql directives in a <Global> block so they'll be | ||
182 | # inherited by the <Anonymous> block below, and any other <VirtualHost> | ||
183 | @@ -159,6 +168,9 @@ | ||
184 | AllowOverwrite on | ||
185 | </Directory> | ||
186 | |||
187 | +TransferLog /var/log/proftpd/xferlog | ||
188 | +SystemLog /var/log/proftpd/proftpd.log | ||
189 | + | ||
190 | # A basic anonymous configuration, no upload directories. If you | ||
191 | # don't want to support anonymous access, simply remove this | ||
192 | # <Anonymous ..> ... </Anonymous> block. | ||
193 | diff -Naur proftpd-1.3.3/sample-configurations/virtual.conf proftpd-1.3.3-magellan/sample-configurations/virtual.conf | ||
194 | --- proftpd-1.3.3/sample-configurations/virtual.conf 2003-07-25 07:36:24.000000000 +0200 | ||
195 | +++ proftpd-1.3.3-magellan/sample-configurations/virtual.conf 2010-03-02 23:26:37.000000000 +0100 | ||
196 | @@ -1,8 +1,18 @@ | ||
197 | # This sample configuration file illustrates creating two | ||
198 | # virtual servers, and associated anonymous logins. | ||
199 | |||
200 | -ServerName "ProFTPD" | ||
201 | -ServerType inetd | ||
202 | +# Includes DSO modules | ||
203 | +Include /etc/proftpd/modules.conf | ||
204 | + | ||
205 | +ServerName "Magellan Virtual Server Installation" | ||
206 | +ServerType standalone | ||
207 | + | ||
208 | +DefaultServer on | ||
209 | +MultilineRFC2228 on | ||
210 | +ShowSymlinks on | ||
211 | + | ||
212 | +# Set off to disable IPv6 support which is annoying on IPv4 only boxes. | ||
213 | +UseIPv6 on | ||
214 | |||
215 | # Port 21 is the standard FTP port. | ||
216 | Port 21 | ||
217 | @@ -11,14 +21,14 @@ | ||
218 | # main server and all virtualhosts. | ||
219 | |||
220 | <Global> | ||
221 | - # Umask 022 is a good standard umask to prevent new dirs and files | ||
222 | - # from being group and world writable. | ||
223 | - Umask 022 | ||
224 | + # Umask 022 is a good standard umask to prevent new files and dirs | ||
225 | + # (second param) from being group and world writable. | ||
226 | + Umask 022 022 | ||
227 | </Global> | ||
228 | |||
229 | # Set the user and group that the server normally runs at. | ||
230 | -User nobody | ||
231 | -Group nogroup | ||
232 | +User proftpd | ||
233 | +Group proftpd | ||
234 | |||
235 | # To prevent DoS attacks, set the maximum number of child processes | ||
236 | # to 30. If you need to allow more than 30 concurrent connections | ||
237 | @@ -31,6 +41,9 @@ | ||
238 | # Maximum seconds a data connection may "stall" | ||
239 | TimeoutStalled 300 | ||
240 | |||
241 | +TransferLog /var/log/proftpd/xferlog | ||
242 | +SystemLog /var/log/proftpd/proftpd.log | ||
243 | + | ||
244 | # First virtual server | ||
245 | <VirtualHost ftp.virtual.com> | ||
246 | ServerName "Virtual.com's FTP Server" |