I should learn to type

[mirror/dsa-puppet.git] / modules / debian_org / manifests / init.pp

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index cdf1e62..943c369 100644 (file)
--- 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