X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=943c36946dbe72aa29b6a83647e1808c219b816b;hb=faf0b00a7b3ef90757b7fcf9dec93c9987383f8a;hp=cdf1e6273637cf50f19f169b5f1c6a5fd1bbca97;hpb=d824f9b2ae6fe566ad3c47c9d4f0c6aaa1057242;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index cdf1e6273..943c36946 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':
@@ -341,13 +340,15 @@ class debian_org {
 	}
 
 	# our ipv6 addresses and routes are statically configured.
+	file { '/etc/network/if-pre-up.d/no_accept_ra':
+		source => 'puppet:///modules/debian_org/ifupdown-pre-up-accept-ra',
+		mode   => '0555',
+	}
 	base::sysctl { 'dsa-accept-ra-default':
-		key   => 'net.ipv6.conf.default.accept_ra',
-		value => 0,
+		ensure => absent,
 	}
 	base::sysctl { 'dsa-accept-ra-all':
-		key   => 'net.ipv6.conf.all.accept_ra',
-		value => 0,
+		ensure => absent,
 	}
 
 	# Disable kpartx udev rules