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 01cff6e..be1fe71 100644 (file)
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -158,9 +158,16 @@ class debian_org {
                notify => Exec['systemctl daemon-reload'],
        }
 
-       concat { '/etc/cron.d/dsa-puppet-stuff': }
-       concat::fragment { 'dsa-puppet-stuff---header':
-               target => '/etc/cron.d/dsa-puppet-stuff',
+       file { '/etc/cron.d/dsa-puppet-stuff':
+               ensure => 'absent',
+       }
+       file { '/etc/dsa/cron.ignore.dsa-puppet-stuff':
+               ensure => 'absent',
+       }
+
+       concat { '/etc/cron.d/puppet-crontab': }
+       concat::fragment { 'puppet-crontab---header':
+               target => '/etc/cron.d/puppet-crontab',
                order  => '000',
                content  => @(EOF)
                        ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
@@ -169,10 +176,10 @@ class debian_org {
                        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',
+       concat::fragment { 'puppet-crontab---all':
+               target => '/etc/cron.d/puppet-crontab',
                order  => '010',
-               content => template('debian_org/dsa-puppet-stuff.cron.erb'),
+               content => template('debian_org/puppet-crontab.cron.erb'),
                require => Package['debian.org'],
        }
        file { '/etc/ldap/ldap.conf':
@@ -196,8 +203,8 @@ class debian_org {
                ensure => directory,
                mode   => '0755',
        }
-       file { '/etc/dsa/cron.ignore.dsa-puppet-stuff':
-               source  => 'puppet:///modules/debian_org/dsa-puppet-stuff.cron.ignore',
+       file { '/etc/dsa/cron.ignore.puppet-crontab':
+               source  => 'puppet:///modules/debian_org/puppet-crontab.cron.ignore',
                require => Package['debian.org']
        }
        file { '/etc/nsswitch.conf':
@@ -262,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':
@@ -333,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' },