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

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index af8f8bbf6..09d3ac749 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -20,6 +20,7 @@ class debian_org {
 	}
 
 	$samhain_recipients = hiera('samhain_recipients')
+	$root_mail_alias = hiera('root_mail_alias')
 
 	package { [
 			'klogd',
@@ -177,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'],
 	}
@@ -222,6 +236,14 @@ class debian_org {
 		mode   => '0444',
 		source => 'puppet:///modules/debian_org/etc.zsh/zprofile',
 	}
+	file { '/etc/environment':
+		content => "",
+		mode => '0440',
+	}
+	file { '/etc/default/locale':
+		content => "",
+		mode => '0444',
+	}
 
 	# set mmap_min_addr to 4096 to mitigate
 	# Linux NULL-pointer dereference exploits
@@ -247,6 +269,11 @@ class debian_org {
 		recipient => $samhain_recipients,
 		require   => Package['debian.org']
 	}
+	mailalias { 'root':
+		ensure    => present,
+		recipient => $root_mail_alias,
+		require   => Package['debian.org']
+	}
 
 	file { '/usr/local/bin/check_for_updates':
 		source => 'puppet:///modules/debian_org/check_for_updates',
@@ -315,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',
+	}
 }