Annotation of /trunk/proftpd/patches/proftpd-1.3.3-config-ban.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: 4253 byte(s)
Wed Mar 3 19:08:46 2010 UTC (14 years, 6 months ago) by niro
File size: 4253 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 2010-03-03 19:37:33.000000000 +0100 | ||
3 | +++ proftpd-1.3.3-magellan/sample-configurations/anonymous.conf 2010-03-03 19:40:05.000000000 +0100 | ||
4 | @@ -73,6 +73,22 @@ | ||
5 | </IfModule> | ||
6 | </IfDefine> | ||
7 | |||
8 | +# # Dynamic Ban List (http://www.proftpd.org/docs/contrib/mod_ban.html) | ||
9 | +# Enable this with PROFTPD_OPTIONS=-DBAN in /etc/conf.d/proftpd | ||
10 | +<IfDefine BAN> | ||
11 | + BanEngine on | ||
12 | + BanLog /var/log/proftpd/ban.log | ||
13 | + BanTable /var/run/proftpd/ban.tab | ||
14 | + | ||
15 | + # If the same client reaches the MaxLoginAttempts limit 2 times | ||
16 | + # within 10 minutes, automatically add a ban for that client that | ||
17 | + # will expire after one hour. | ||
18 | + BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00 | ||
19 | + | ||
20 | + # Allow the FTP admin to manually add/remove bans | ||
21 | + BanControlsACLs all allow user ftpadm | ||
22 | +</IfDefine> | ||
23 | + | ||
24 | # Our "basic" anonymous configuration, including a single | ||
25 | # upload directory ("uploads") | ||
26 | <Anonymous ~ftp> | ||
27 | diff -Naur proftpd-1.3.3/sample-configurations/basic.conf proftpd-1.3.3-magellan/sample-configurations/basic.conf | ||
28 | --- proftpd-1.3.3/sample-configurations/basic.conf 2010-03-03 19:37:33.000000000 +0100 | ||
29 | +++ proftpd-1.3.3-magellan/sample-configurations/basic.conf 2010-03-03 19:40:18.000000000 +0100 | ||
30 | @@ -74,6 +74,22 @@ | ||
31 | </IfModule> | ||
32 | </IfDefine> | ||
33 | |||
34 | +# # Dynamic Ban List (http://www.proftpd.org/docs/contrib/mod_ban.html) | ||
35 | +# Enable this with PROFTPD_OPTIONS=-DBAN in /etc/conf.d/proftpd | ||
36 | +<IfDefine BAN> | ||
37 | + BanEngine on | ||
38 | + BanLog /var/log/proftpd/ban.log | ||
39 | + BanTable /var/run/proftpd/ban.tab | ||
40 | + | ||
41 | + # If the same client reaches the MaxLoginAttempts limit 2 times | ||
42 | + # within 10 minutes, automatically add a ban for that client that | ||
43 | + # will expire after one hour. | ||
44 | + BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00 | ||
45 | + | ||
46 | + # Allow the FTP admin to manually add/remove bans | ||
47 | + BanControlsACLs all allow user ftpadm | ||
48 | +</IfDefine> | ||
49 | + | ||
50 | # A basic anonymous configuration, no upload directories. | ||
51 | |||
52 | # <Anonymous ~ftp> | ||
53 | diff -Naur proftpd-1.3.3/sample-configurations/mod_sql.conf proftpd-1.3.3-magellan/sample-configurations/mod_sql.conf | ||
54 | --- proftpd-1.3.3/sample-configurations/mod_sql.conf 2010-03-03 19:37:33.000000000 +0100 | ||
55 | +++ proftpd-1.3.3-magellan/sample-configurations/mod_sql.conf 2010-03-03 19:40:34.000000000 +0100 | ||
56 | @@ -104,6 +104,22 @@ | ||
57 | </IfModule> | ||
58 | </IfDefine> | ||
59 | |||
60 | +# # Dynamic Ban List (http://www.proftpd.org/docs/contrib/mod_ban.html) | ||
61 | +# Enable this with PROFTPD_OPTIONS=-DBAN in /etc/conf.d/proftpd | ||
62 | +<IfDefine BAN> | ||
63 | + BanEngine on | ||
64 | + BanLog /var/log/proftpd/ban.log | ||
65 | + BanTable /var/run/proftpd/ban.tab | ||
66 | + | ||
67 | + # If the same client reaches the MaxLoginAttempts limit 2 times | ||
68 | + # within 10 minutes, automatically add a ban for that client that | ||
69 | + # will expire after one hour. | ||
70 | + BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00 | ||
71 | + | ||
72 | + # Allow the FTP admin to manually add/remove bans | ||
73 | + BanControlsACLs all allow user ftpadm | ||
74 | +</IfDefine> | ||
75 | + | ||
76 | # We put our mod_sql directives in a <Global> block so they'll be | ||
77 | # inherited by the <Anonymous> block below, and any other <VirtualHost> | ||
78 | # blocks we may want to add. For a simple server these don't need to | ||
79 | diff -Naur proftpd-1.3.3/sample-configurations/virtual.conf proftpd-1.3.3-magellan/sample-configurations/virtual.conf | ||
80 | --- proftpd-1.3.3/sample-configurations/virtual.conf 2010-03-03 19:37:33.000000000 +0100 | ||
81 | +++ proftpd-1.3.3-magellan/sample-configurations/virtual.conf 2010-03-03 19:40:44.000000000 +0100 | ||
82 | @@ -69,6 +69,22 @@ | ||
83 | </IfModule> | ||
84 | </IfDefine> | ||
85 | |||
86 | +# # Dynamic Ban List (http://www.proftpd.org/docs/contrib/mod_ban.html) | ||
87 | +# Enable this with PROFTPD_OPTIONS=-DBAN in /etc/conf.d/proftpd | ||
88 | +<IfDefine BAN> | ||
89 | + BanEngine on | ||
90 | + BanLog /var/log/proftpd/ban.log | ||
91 | + BanTable /var/run/proftpd/ban.tab | ||
92 | + | ||
93 | + # If the same client reaches the MaxLoginAttempts limit 2 times | ||
94 | + # within 10 minutes, automatically add a ban for that client that | ||
95 | + # will expire after one hour. | ||
96 | + BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00 | ||
97 | + | ||
98 | + # Allow the FTP admin to manually add/remove bans | ||
99 | + BanControlsACLs all allow user ftpadm | ||
100 | +</IfDefine> | ||
101 | + | ||
102 | # First virtual server | ||
103 | <VirtualHost ftp.virtual.com> | ||
104 | ServerName "Virtual.com's FTP Server" |