File tree 5 files changed +28
-17
lines changed
5 files changed +28
-17
lines changed Original file line number Diff line number Diff line change 30
30
31
31
default [ :apache ] [ :buffered_logs ] = true
32
32
33
- default [ :apache ] [ :evasive ] = true
33
+ default [ :apache ] [ :evasive ] [ :enable ] = true
34
+ default [ :apache ] [ :evasive ] [ :dos_hash_table_size ] = 65536
35
+ default [ :apache ] [ :evasive ] [ :dos_page_count ] = 50
36
+ default [ :apache ] [ :evasive ] [ :dos_site_count ] = 250
37
+ default [ :apache ] [ :evasive ] [ :dos_page_interval ] = 1
38
+ default [ :apache ] [ :evasive ] [ :dos_site_interval ] = 1
39
+ default [ :apache ] [ :evasive ] [ :dos_blocking_period ] = 60
Original file line number Diff line number Diff line change 62
62
notifies :restart , "service[apache2]"
63
63
end
64
64
65
- service "apache2" do
66
- action [ :enable , :start ]
67
- retries 2
68
- retry_delay 10
69
- supports :status => true , :restart => true , :reload => true
70
- end
71
-
72
65
apache_module "info" do
73
66
conf "info.conf.erb"
74
67
variables :hosts => admins [ "hosts" ]
79
72
variables :hosts => admins [ "hosts" ]
80
73
end
81
74
82
- if node [ :apache ] [ :evasive ]
75
+ if node [ :apache ] [ :evasive ] [ :enable ]
83
76
apache_module "evasive" do
84
77
conf "evasive.conf.erb"
85
78
end
104
97
template "ssl.erb"
105
98
end
106
99
100
+ # Apache should only be started after modules enabled
101
+ service "apache2" do
102
+ action [ :enable , :start ]
103
+ retries 2
104
+ retry_delay 10
105
+ supports :status => true , :restart => true , :reload => true
106
+ end
107
+
107
108
fail2ban_filter "apache-forbidden" do
108
109
action :delete
109
110
end
Original file line number Diff line number Diff line change 1
1
# DO NOT EDIT - This file is being maintained by Chef
2
2
3
3
< IfModule mod_evasive20.c >
4
- DOSHashTableSize 65536
5
- DOSPageCount 50
6
- DOSSiteCount 250
7
- DOSPageInterval 1
8
- DOSSiteInterval 1
9
- DOSBlockingPeriod 60
4
+ DOSHashTableSize <%= node [ :apache ] [ :evasive ] [ :dos_hash_table_size ] %>
5
+ DOSPageCount <%= node [ :apache ] [ :evasive ] [ :dos_page_count ] %>
6
+ DOSSiteCount <%= node [ :apache ] [ :evasive ] [ :dos_site_count ] %>
7
+ DOSPageInterval <%= node [ :apache ] [ :evasive ] [ :dos_page_interval ] %>
8
+ DOSSiteInterval <%= node [ :apache ] [ :evasive ] [ :dos_site_interval ] %>
9
+ DOSBlockingPeriod <%= node [ :apache ] [ :evasive ] [ :dos_blocking_period ] %>
10
10
</ IfModule >
Original file line number Diff line number Diff line change 3
3
4
4
default_attributes (
5
5
:apache => {
6
- :evasive => false
6
+ :evasive => {
7
+ :enable => false
8
+ }
7
9
}
8
10
)
9
11
Original file line number Diff line number Diff line change 13
13
:apache => {
14
14
:mpm => "event" ,
15
15
:timeout => 60 ,
16
- :evasive => false ,
16
+ :evasive => {
17
+ :enable => false
18
+ } ,
17
19
:event => {
18
20
:threads_per_child => 20 ,
19
21
:min_spare_threads => 300 ,
You can’t perform that action at this time.
0 commit comments