Retire dsa-is-shutdown-scheduled in favor of test -e /run/systemd/shutdown/scheduled

[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 e169151..be1fe71 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':
@@ -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' },