Remove wheezy-supporting cruft

[mirror/dsa-puppet.git] / modules / ferm / manifests / init.pp

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index a977e98..9290d35 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -9,32 +9,37 @@
 class ferm {
        # realize (i.e. enable) all @ferm::rule virtual resources
        Ferm::Rule <| |>
+       Ferm::Conf <| |>
 
        File { mode => '0400' }
 
        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 = split(regsubst($::v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
 
        munin::check { $munin_ips: script => 'ip_', }
 
        if $v6ips {
-               $munin6_ips = split(regsubst($v6ips, '([^,]+)', 'ip_\1', 'G'), ',')
+               $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'), ',')
+       $munin6_ip6s = split(regsubst($::v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
        munin::check { $munin6_ip6s: ensure => absent }
 
        file { '/etc/ferm':
@@ -54,6 +59,10 @@ class ferm {
        file { '/etc/ferm/conf.d':
                ensure => directory,
                mode   => '0555',
+               purge   => true,
+               force   => true,
+               recurse => true,
+               source  => 'puppet:///files/empty/',
        }
        file { '/etc/default/ferm':
                source  => 'puppet:///modules/ferm/ferm.default',
@@ -62,7 +71,11 @@ class ferm {
                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':
@@ -77,10 +90,23 @@ class ferm {
                content => template('ferm/interfaces.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,
        }
 
 }