snapshot - drop traffic from 61.69.254.110

[mirror/dsa-puppet.git] / modules / roles / manifests / snapshot_web.pp

diff --git a/modules/roles/manifests/snapshot_web.pp b/modules/roles/manifests/snapshot_web.pp
index 6054b52..6a6414f 100644 (file)
--- a/modules/roles/manifests/snapshot_web.pp
+++ b/modules/roles/manifests/snapshot_web.pp
@@ -2,6 +2,13 @@ class roles::snapshot_web {
        include apache2
        include apache2::rewrite
 
+       # snapshot abusers
+       #  61.69.254.110 - 20180705, mirroring with wget
+       @ferm::rule { 'dsa-nat-snapshot-varnish-v4':
+               prio  => "000",
+               rule  => "saddr (61.69.254.110) DROP",
+       }
+
        ensure_packages ( [
                "libapache2-mod-wsgi",
                ], {
@@ -14,6 +21,11 @@ class roles::snapshot_web {
        }
 
        case $::hostname {
+               'lw07': {
+                       $ipv4addr        = '185.17.185.185'
+                       $ipv6addr        = '2001:1af8:4020:b030:deb::185'
+                       $ipv6addr_apache = '2001:1af8:4020:b030:deb::187'
+               }
                'sallinen': {
                        $ipv4addr        = '193.62.202.27'
                        $ipv6addr        = '2001:630:206:4000:1a1a:0:c13e:ca1b'
@@ -24,9 +36,8 @@ class roles::snapshot_web {
                }
        }
 
-       @ferm::rule { 'dsa-snapshot-varnish-v4':
-               rule  => '&SERVICE(tcp, 6081)',
-       }
+       # varnish cache
+       ###############
        @ferm::rule { 'dsa-nat-snapshot-varnish-v4':
                table => 'nat',
                chain => 'PREROUTING',
@@ -42,6 +53,7 @@ class roles::snapshot_web {
                content => template('roles/snapshot/snapshot.debian.org.vcl.erb'),
        }
 
+       # the ipv6 port 80 is owned by varnish
        file { '/etc/apache2/ports.conf':
                content  => @("EOF"),
                        Listen 0.0.0.0:80
@@ -50,4 +62,17 @@ class roles::snapshot_web {
                require => Package['apache2'],
                notify  => Service['apache2'],
        }
+
+       # haproxy ssl termination
+       #########################
+       include haproxy
+       file { '/etc/haproxy/haproxy.cfg':
+               content => template('roles/snapshot/haproxy.cfg.erb'),
+               require => Package['haproxy'],
+               notify  => Service['haproxy'],
+       }
+       ssl::service { 'snapshot.debian.org':
+               notify  => Service['haproxy'],
+               key => true,
+       }
 }