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 06bafa9..9290d35 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -16,18 +16,12 @@ class ferm {
        package { 'ferm':
                ensure => installed
        }
-       if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
-               package { 'ulogd2':
-                       ensure => installed
-               }
-               package { 'ulogd':
-                       # Remove instead of purge ulogd because it deletes log files on purge.
-                       ensure => absent
-               }
-       } else {
-               package { 'ulogd':
-                       ensure => installed
-               }
+       package { 'ulogd2':
+               ensure => installed
+       }
+       package { 'ulogd':
+               # Remove instead of purge ulogd because it deletes log files on purge.
+               ensure => absent
        }
 
        service { 'ferm':
@@ -96,31 +90,23 @@ class ferm {
                content => template('ferm/interfaces.conf.erb'),
                notify  => Service['ferm'],
        }
-       if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
-               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':
-                       ensure  => absent,
-               }
-               file { '/etc/logrotate.d/ulogd.dpkg-bak':
-                       ensure  => absent,
-               }
-               file { '/etc/logrotate.d/ulogd.dpkg-dist':
-                       ensure  => absent,
-               }
-       } else {
-               file { '/etc/logrotate.d/ulogd':
-                       source  => 'puppet:///modules/ferm/logrotate-ulogd',
-                       mode    => '0444',
-                       require => Package['debian.org'],
-               }
+       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':
+               ensure  => absent,
+       }
+       file { '/etc/logrotate.d/ulogd.dpkg-bak':
+               ensure  => absent,
+       }
+       file { '/etc/logrotate.d/ulogd.dpkg-dist':
+               ensure  => absent,
        }
 
 }