X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=06bafa9c692eb350dd3795a8cb3b75c8d325723d;hb=73d5f5f9ad5cc0f142a37bea0ebc1493027bc836;hp=869a3d6603f577002f10ea1e8e58830184ed3fb3;hpb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp index 869a3d660..06bafa9c6 100644 --- a/modules/ferm/manifests/init.pp +++ b/modules/ferm/manifests/init.pp @@ -16,7 +16,7 @@ class ferm { package { 'ferm': ensure => installed } - if ($::lsbmajdistrelease >= '8') { + if (versioncmp($::lsbmajdistrelease, '8') >= 0) { package { 'ulogd2': ensure => installed } @@ -80,6 +80,10 @@ class ferm { 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/me.conf.erb'), notify => Service['ferm'], @@ -92,7 +96,7 @@ class ferm { content => template('ferm/interfaces.conf.erb'), notify => Service['ferm'], } - if ($::lsbmajdistrelease >= '8') { + if (versioncmp($::lsbmajdistrelease, '8') >= 0) { augeas { 'logrotate_ulogd2': context => '/files/etc/logrotate.d/ulogd2', changes => [