X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=09d3ac7494a5f49f75e45606930571c42dddb907;hb=b8fdae7d40deafb5ba21a7dad303bb0659737f41;hp=b94e2a736678b14dc7dbc4743901d66888fe61ed;hpb=ee95bd5a03ad815fc69882b784f237dae94a1d64;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index b94e2a736..09d3ac749 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -178,7 +178,20 @@ class debian_org {
 		notify => Exec['systemctl daemon-reload'],
 	}
 
-	file { '/etc/cron.d/dsa-puppet-stuff':
+	concat { '/etc/cron.d/dsa-puppet-stuff': }
+	concat::fragment { 'dsa-puppet-stuff---header':
+		target => '/etc/cron.d/dsa-puppet-stuff',
+		order  => '000',
+		content  => @(EOF)
+			## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+			SHELL=/bin/bash
+			MAILTO=root
+			PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/nagios/plugins
+			| EOF
+	}
+	concat::fragment { 'dsa-puppet-stuff---all':
+		target => '/etc/cron.d/dsa-puppet-stuff',
+		order  => '010',
 		content => template('debian_org/dsa-puppet-stuff.cron.erb'),
 		require => Package['debian.org'],
 	}
@@ -329,4 +342,18 @@ class debian_org {
 			package { 'irqbalance': ensure => installed }
 		}
 	}
+
+
+	# https://www.decadent.org.uk/ben/blog/bpf-security-issues-in-debian.html
+	site::sysctl { 'unprivileged_bpf_disabled':
+		key   => 'kernel.unprivileged_bpf_disabled',
+		value => '1',
+	}
+
+	# Disable kpartx udev rules
+	file { '/etc/udev/rules.d/60-kpartx.rules':
+		ensure => $has_lib_udev_rules_d_60_kpartx_rules ? { true  => 'present', default => 'absent' },
+		content => "",
+		mode => '0444',
+	}
 }