package { 'ferm':
ensure => installed
}
- package { 'ulogd':
+ package { 'ulogd2':
ensure => installed
}
+ package { 'ulogd':
+ # Remove instead of purge ulogd because it deletes log files on purge.
+ ensure => absent
+ }
service { 'ferm':
hasstatus => false,
status => '/bin/true',
}
- $munin_ips = split(regsubst($::v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
+ $munin_ips = getfromhash($site::nodeinfo, 'misc', 'v4addrs')
+ .map |$addr| { "ip_${addr}" }
munin::check { $munin_ips: script => 'ip_', }
- if $v6ips {
- $munin6_ips = split(regsubst($::v6ips, '([^,]+)', 'ip_\1', 'G'), ',')
- munin::ipv6check { $munin6_ips: }
- }
-
- # get rid of old stuff
- $munin6_ip6s = split(regsubst($::v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
- munin::check { $munin6_ip6s: ensure => absent }
+ $munin6_ips = getfromhash($site::nodeinfo, 'misc', 'v6addrs')
+ .map |$addr| { "ip_${addr}" }
+ munin::ipv6check { $munin6_ips: }
file { '/etc/ferm':
ensure => directory,
mode => '0444',
}
file { '/etc/ferm/ferm.conf':
- source => 'puppet:///modules/ferm/ferm.conf',
+ content => template('ferm/ferm.conf.erb'),
+ notify => Service['ferm'],
+ }
+ file { '/etc/ferm/conf.d/00-init.conf':
+ content => template('ferm/00-init.conf.erb'),
notify => Service['ferm'],
}
file { '/etc/ferm/conf.d/me.conf':
content => template('ferm/defs.conf.erb'),
notify => Service['ferm'],
}
- file { '/etc/ferm/conf.d/interfaces.conf':
- content => template('ferm/interfaces.conf.erb'),
+
+ file { '/etc/ferm/conf.d/50-munin-interfaces.conf':
+ content => template('ferm/conf.d-munin-interfaces.conf.erb'),
+ notify => Service['ferm'],
+ }
+ @ferm::rule { 'dsa-munin-interfaces-in':
+ prio => '001',
+ description => 'munin accounting',
+ chain => 'INPUT',
+ domain => '(ip ip6)',
+ rule => 'daddr ($MUNIN_IPS) NOP'
+ }
+ @ferm::rule { 'dsa-munin-interfaces-out':
+ prio => '001',
+ description => 'munin accounting',
+ chain => 'OUTPUT',
+ domain => '(ip ip6)',
+ rule => 'saddr ($MUNIN_IPS) NOP'
+ }
+
+ file { '/etc/ferm/dsa.d/010-base.conf':
+ content => template('ferm/dsa.d-010-base.conf.erb'),
notify => Service['ferm'],
}
+
+ augeas { 'logrotate_ulogd2':
+ context => '/files/etc/logrotate.d/ulogd2',
+ changes => [
+ 'set rule/schedule daily',
+ 'set rule/delaycompress delaycompress',
+ 'set rule/rotate 10',
+ 'set rule/ifempty notifempty',
+ ],
+ }
file { '/etc/logrotate.d/ulogd':
- source => 'puppet:///modules/ferm/logrotate-ulogd',
- mode => '0444',
- require => Package['debian.org'],
+ ensure => absent,
+ }
+ file { '/etc/logrotate.d/ulogd.dpkg-bak':
+ ensure => absent,
+ }
+ file { '/etc/logrotate.d/ulogd.dpkg-dist':
+ ensure => absent,
}
}