X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=ae4ea19b29085f26bb12a4a0d5daf69d74422c23;hb=13e495c55be6f08f72739620b0dcbff2b9635474;hp=7115b7c8f9eedf1b1f624cbf635bb3f13f43eb19;hpb=dd99646641ae4254be0ebde30b22b7a3e48e189e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 7115b7c8f..ae4ea19b2 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -77,7 +77,7 @@ 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/me.conf':
@@ -105,6 +105,12 @@ class ferm {
 		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',