X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=30f0ea0421efb20e764bfa04404b8e8715c2b2e1;hb=3324b4ae702172197fe7ad725a36f052f1e67c71;hp=a2d5aeef3d4e48c5ef18675c72eaed71f6b9a1dd;hpb=479f3289576347868269b93c26260e399f8069b8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index a2d5aeef3..30f0ea042 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,82 +1,55 @@
 class roles::security_mirror {
-	include roles::archvsync_base
-
-	$rsync_bind = $::hostname ? {
-		mirror-anu => '150.203.164.61',
-		mirror-isc => '149.20.4.14',
-		mirror-umn => '128.101.240.215',
-		default    => '',
-	}
-	$rsync_bind6 = $::hostname ? {
-		mirror-anu => '2001:388:1034:2900::3d',
-		mirror-isc => '2001:4f8:1:c::14',
-		mirror-umn => '2607:ea00:101:3c0b::1deb:215',
-		default    => '',
-	}
-	$ftp_bind = $::hostname ? {
-		mirror-anu => '150.203.164.61',
-		default => '',
-	}
-	$ftp_bind6 = $::hostname ? {
-		mirror-anu => '2001:388:1034:2900::3d',
-		default => undef,
-	}
-
-	file { '/srv/mirrors/debian-security':
-		ensure => link,
-		target => '../ftp.root/debian-security',
-	}
-
-	include apache2::expires
-	include apache2::rewrite
-
-	apache2::site { '010-security.debian.org':
-		site   => 'security.debian.org',
-		content => template('roles/security_mirror/security.debian.org.erb')
-	}
-
-	include ferm::ftp_conntrack
-	vsftpd::site { 'security':
-		banner       => 'security.debian.org FTP server (vsftpd)',
-		logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
-		max_clients  => 200,
-		root         => '/srv/ftp.root/',
-		bind         => $ftp_bind,
-	}
-	if ($ftp_bind6) {
-		vsftpd::site { 'security6':
-			banner       => 'security.debian.org FTP server (vsftpd)',
-			logfile      => '/var/log/ftp/vsftpd-security6.debian.org.log',
-			max_clients  => 200,
-			root         => '/srv/ftp.root/',
-			bind         => $ftp_bind6,
-		}
-	}
-
-	rsync::site { 'security':
-		source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
-		max_clients => 100,
-		bind        => $rsync_bind,
-		bind6       => $rsync_bind6,
-	}
-
-	$onion_v4_addr = $::hostname ? {
-		mirror-anu => '150.203.164.61',
-		mirror-isc => '149.20.4.14',
-		mirror-umn => '128.101.240.215',
-		villa      => '212.211.132.32',
-		lobos      => '212.211.132.250',
-		default   => undef,
-	}
-	if has_role('security_mirror_onion') {
-		if ! $onion_v4_addr {
-			fail("Do not have an onion_v4_addr set for $::hostname.")
-		}
-
-		onion::service { 'security.debian.org':
-			port => 80,
-			target_port => 80,
-			target_address => $onion_v4_addr,
-		}
-	}
+  include roles::archvsync_base
+
+  # security abusers
+  #  198.108.67.48 DoS against our rsync service
+  ferm::rule { 'dsa-security-abusers':
+    prio => '005',
+    rule => 'saddr ( 198.108.67.48/32 ) DROP',
+  }
+
+  $binds = $::hostname ? {
+    mirror-anu => [ '150.203.164.61', '[2001:388:1034:2900::3d]' ],
+    mirror-isc => [ '149.20.4.14', '[2001:4f8:1:c::14]' ],
+    mirror-umn => [ '128.101.240.215', '[2607:ea00:101:3c0b::1deb:215]' ],
+    schmelzer  => [ '217.196.149.233', '[2a02:16a8:dc41:100::233]' ],
+    default    => [ '[::]' ],
+  }
+
+  include apache2::expires
+  include apache2::rewrite
+
+  apache2::site { '010-security.debian.org':
+    site    => 'security.debian.org',
+    content => template('roles/security_mirror/security.debian.org.erb')
+  }
+
+  $mirrors = hiera('roles.security_mirror', {})
+  $fastly_mirrors = $mirrors.filter |$h| { $h[1]['fastly-backend'] }
+  $hosts_to_check = $fastly_mirrors.map |$h| { $h[1]['service-hostname'] }
+
+  roles::mirror_health { 'security':
+    check_hosts   => $hosts_to_check,
+    check_service => 'security',
+    url           => 'http://security.backend.mirrors.debian.org/debian-security/dists/stable/updates/Release',
+    health_url    => 'http://security.backend.mirrors.debian.org/_health',
+        }
+
+  rsync::site { 'security':
+    source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
+    max_clients => 100,
+    binds       => $binds,
+  }
+
+  $onion_v4_addr = hiera('roles.security_mirror', {})
+    .dig($::fqdn, 'onion_v4_address')
+  if $onion_v4_addr {
+    onion::service { 'security.debian.org':
+      port           => 80,
+      target_port    => 80,
+      target_address => $onion_v4_addr,
+    }
+  }
+
+  Ferm::Rule::Simple <<| tag == 'ssh::server::from::security_master' |>>
 }