X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=95ccf82db101d5c110e40e1973cd50f8197a5a69;hb=2d1ec427e3c71ed97101e3dc53b8ece95624d67f;hp=77f4c03c64f1045086c8c587f192bc5c6876e105;hpb=2aa7a2ddccd274926e20eecebfd7dbf01f88eb03;p=mirror%2Fdsa-puppet.git diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index 77f4c03c6..95ccf82db 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -16,12 +16,18 @@ # Sets appropriate firewall rules and optionally rate limits. # @param mpm Which Multi-Processing Modules to use. Defaults to worker; # the alternative is prefork. +# @param rate_limit Rate limit incoming connections at the netfilter level. If false, +# (and public is true), all incoming connections to the http +# and https ports get sent to the http chain, and accepted at +# ferm prio 90, so other things can be done to web traffic +# before that. class apache2( Boolean $smaller_number_of_threads = false, Integer $rlimitnproc = 256, Integer $rlimitmem = 192 * 1024 * 1024, Boolean $public = true, Enum['prefork','worker'] $mpm = 'worker', + Boolean $rate_limit = false, ) { include webserver @@ -57,14 +63,6 @@ class apache2( ensure => absent, } - if has_role('udd') { - $memlimit = 512 * 1024 * 1024 - } elsif has_role('popcon') { - $memlimit = 512 * 1024 * 1024 - } else { - $memlimit = $rlimitmem - } - apache2::config { 'resource-limits': content => template('apache2/resource-limits.erb'), } @@ -139,14 +137,22 @@ class apache2( } if $public { - if has_role('apache_ratelimited') { + ferm::rule { 'dsa-http': + prio => '23', + description => 'A web subchain', + domain => '(ip ip6)', + rule => 'proto tcp dport (http https 6081) jump http' + } + + if $rate_limit { include apache2::dynamic } else { - ferm::rule { 'dsa-http': + ferm::rule { 'dsa-http-allow': + description => 'http subchain, allow everything', + prio => '90', + chain => 'http', domain => '(ip ip6)', - prio => '23', - description => 'Allow web access', - rule => '&SERVICE(tcp, (http https))' + rule => 'jump ACCEPT', } } } @@ -164,6 +170,6 @@ class apache2( } apache2::config { 'local-scheduled-shutdown': - source => 'puppet:///modules/apache2/local-scheduled-shutdown', + ensure => 'absent', } }