X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_tracker.pp;h=1e93e29e88984059e73d2a6640d04a406e7b062a;hb=afe8043a8dcc9ea09763565b40d9ba061b68ba36;hp=d0741109bfad7aedbe77b22b949d9ae8b77b21e5;hpb=232d0deecdefbaa558bd72a822967257a86d0160;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_tracker.pp b/modules/roles/manifests/security_tracker.pp
index d0741109b..1e93e29e8 100644
--- a/modules/roles/manifests/security_tracker.pp
+++ b/modules/roles/manifests/security_tracker.pp
@@ -1,6 +1,44 @@
 class roles::security_tracker {
+	include apache2::ssl
+	include apache2::proxy_http
+	include apache2::expires
+
+	apache2::module { 'cache_disk':
+		ensure => absent,
+	}
+
+	# security-tracker abusers
+	#  66.170.99.1  20180706 excessive number of requests
+	#  66.170.99.2  20180706 excessive number of requests
+	@ferm::rule { 'dsa-sectracker-abusers':
+		prio  => "005",
+		rule  => "saddr (66.170.99.1 66.170.99.2) DROP",
+	}
+
+
 	ssl::service { 'security-tracker.debian.org':
 		notify  => Exec['service apache2 reload'],
-		tlsaport => 0,
+		key => true,
+	}
+
+	apache2::site { 'security-tracker.debian.org':
+		site   => 'security-tracker.debian.org',
+		content => template('roles/apache-security-tracker.debian.org.conf.erb')
+	}
+
+	# traffic shaping http traffic
+	#@ferm::rule { 'dsa-security-tracker-shape':
+	#	table => 'mangle',
+	#	chain => 'OUTPUT',
+	#	rule  => "proto tcp sport 443 MARK set-mark 20",
+	#}
+
+	file { '/usr/local/sbin/traffic-shape':
+		mode   => '0755',
+		content => template('roles/security-tracker/traffic-shape'),
+		notify => Exec['/usr/local/sbin/traffic-shape'],
+	}
+	exec { '/usr/local/sbin/traffic-shape':
+		refreshonly => true
 	}
 }