$servicefiles = 'absent'
}
- # the virtual facter needs virt-what on jessie to work
- if versioncmp($::lsbmajdistrelease, '9') < 0 {
- package { 'virt-what': ensure => installed }
- } else {
- package { 'virt-what': ensure => purged }
- }
+ # the virtual facter needs virt-what on jessie to work; clean up.
+ package { 'virt-what': ensure => purged }
$samhain_recipients = hiera('samhain_recipients')
$root_mail_alias = hiera('root_mail_alias')
content => "Etc/UTC\n",
notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
}
- if versioncmp($::lsbmajdistrelease, '9') >= 0 { # jessie has a regular file there, for instance
- file { '/etc/localtime':
- ensure => 'link',
- target => '/usr/share/zoneinfo/Etc/UTC',
- notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
- }
+ file { '/etc/localtime':
+ ensure => 'link',
+ target => '/usr/share/zoneinfo/Etc/UTC',
+ notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
}
file { '/etc/puppet/puppet.conf':
content => template('debian_org/puppet.conf.erb'),
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.
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':
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':
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':
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' },