include debian_org::apt
if $systemd {
- include systemd
+ include dsa_systemd
$servicefiles = 'present'
} else {
$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')
ensure => installed,
tag => extra_repo,
}
- file { '/etc/ssh/ssh_known_hosts':
- ensure => present,
- replace => false,
- mode => '0644',
- source => 'puppet:///modules/debian_org/basic-ssh_known_hosts'
- }
- if versioncmp($::lsbmajdistrelease, '8') >= 0 {
- $rubyfs_package = 'ruby-filesystem'
- } else {
- $rubyfs_package = 'libfilesystem-ruby1.9'
- }
package { [
'apt-utils',
'bash-completion',
'dnsutils',
'less',
'lsb-release',
- $rubyfs_package,
+ 'ruby-filesystem',
'mtr-tiny',
'nload',
'pciutils',
'lldpd',
+ 'ncurses-term',
]:
ensure => installed,
}
]:
}
- if getfromhash($site::nodeinfo, 'broken-rtc') {
- package { 'fake-hwclock':
- ensure => installed,
- tag => extra_repo,
- }
- }
-
package { 'molly-guard':
ensure => installed,
}
content => template('debian_org/debian_facts.yaml.erb')
}
file { '/etc/timezone':
- source => 'puppet:///modules/debian_org/timezone',
+ content => "Etc/UTC\n",
notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
}
- if $::hostname == handel {
- include puppetmaster::db
- $dbpassword = $puppetmaster::db::password
+ 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':
- mode => '0755',
+ mode => '0444',
source => 'puppet:///modules/debian_org/nsswitch.conf',
}
# set mmap_min_addr to 4096 to mitigate
# Linux NULL-pointer dereference exploits
- site::sysctl { 'mmap_min_addr':
+ base::sysctl { 'mmap_min_addr':
ensure => absent
}
- site::sysctl { 'perf_event_paranoid':
+ base::sysctl { 'perf_event_paranoid':
key => 'kernel.perf_event_paranoid',
value => '2',
}
- site::sysctl { 'puppet-vfs_cache_pressure':
+ base::sysctl { 'puppet-vfs_cache_pressure':
key => 'vm.vfs_cache_pressure',
value => '10',
}
- site::alternative { 'editor':
+ base::alternative { 'editor':
linkto => '/usr/bin/vim.basic',
}
- site::alternative { 'view':
+ base::alternative { 'view':
linkto => '/usr/bin/vim.basic',
}
mailalias { 'samhain-reports':
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':
source => 'puppet:///modules/debian_org/root-dotfiles/vimrc',
}
- if versioncmp($::lsbmajdistrelease, '9') >= 0 { # older puppets do facts as strings.
+ if versioncmp($::lsbmajdistrelease, '9') == 0 { # older puppets do facts as strings.
if $::processorcount > 1 {
package { 'irqbalance': ensure => installed }
}
+ } else {
+ # 926967 drops the recommendation on irqbalance in Buster
+ package { 'irqbalance': ensure => purged }
}
# https://www.decadent.org.uk/ben/blog/bpf-security-issues-in-debian.html
- site::sysctl { 'unprivileged_bpf_disabled':
+ base::sysctl { 'unprivileged_bpf_disabled':
key => 'kernel.unprivileged_bpf_disabled',
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' },
refreshonly => true,
require => Package['userdir-ldap']
}
+
+ # some changes require rebuilding the initramfs. Have the common exec here.
+ exec { 'update-initramfs -u':
+ path => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+ refreshonly => true;
+ }
}
projects / mirror / dsa-puppet.git / blobdiff