X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=be1fe71094005b90000dc5599970569cf62cbbda;hb=9728596ba8cf819fe5255eb2aee9b2c469b8359c;hp=e1691515105b9d7eaa48501261e2c4976cd41462;hpb=168aa3f05f914802698b8db5fdde823c4e992913;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index e16915151..be1fe7109 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -269,8 +269,7 @@ class debian_org {
 		group  => root,
 	}
 	file { '/usr/local/bin/dsa-is-shutdown-scheduled':
-		source	=> 'puppet:///modules/debian_org/dsa-is-shutdown-scheduled',
-		mode	=> '0555',
+		ensure => 'absent',
 	}
 
 	exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
@@ -340,6 +339,16 @@ class debian_org {
 		value => '1',
 	}
 
+	# our ipv6 addresses and routes are statically configured.
+	base::sysctl { 'dsa-accept-ra-default':
+		key   => 'net.ipv6.conf.default.accept_ra',
+		value => 0,
+	}
+	base::sysctl { 'dsa-accept-ra-all':
+		key   => 'net.ipv6.conf.all.accept_ra',
+		value => 0,
+	}
+
 	# 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' },