X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=196a39e9187133dd4c8e3aa19930ccb0b5faa220;hb=93481f49de29f36f8116229d46f4d29e452af8f5;hp=c4c906db6621cad563c8efdfd1c107f14cd87e3a;hpb=29be77ffd25e281b590b5c5f1f99abae0b164b1a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index c4c906db6..196a39e91 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -7,8 +7,6 @@
 #   include ferm
 #
 class ferm {
-	include stdlib
-
 	# realize (i.e. enable) all @ferm::rule virtual resources
 	Ferm::Rule <| |>
 	Ferm::Conf <| |>
@@ -30,8 +28,14 @@ class ferm {
 		hasstatus   => false,
 		status      => '/bin/true',
 	}
+	exec {
+		"ferm reload":
+			command     => "service ferm reload",
+			refreshonly => true,
+	}
+
 
-	$munin_ips = unique(getfromhash($site::nodeinfo, 'misc', 'v4addrs'))
+	$munin_ips = getfromhash($site::nodeinfo, 'misc', 'v4addrs')
 		.map |$addr| { "ip_${addr}" }
 
 	munin::check { $munin_ips: script => 'ip_', }
@@ -42,7 +46,7 @@ class ferm {
 
 	file { '/etc/ferm':
 		ensure  => directory,
-		notify  => Service['ferm'],
+		notify  => Exec['ferm reload'],
 		require => Package['ferm'],
 		mode    => '0755'
 	}
@@ -65,29 +69,29 @@ class ferm {
 	file { '/etc/default/ferm':
 		source  => 'puppet:///modules/ferm/ferm.default',
 		require => Package['ferm'],
-		notify  => Service['ferm'],
+		notify  => Exec['ferm reload'],
 		mode    => '0444',
 	}
 	file { '/etc/ferm/ferm.conf':
 		content => template('ferm/ferm.conf.erb'),
-		notify  => Service['ferm'],
+		notify  => Exec['ferm reload'],
 	}
 	file { '/etc/ferm/conf.d/00-init.conf':
 		content => template('ferm/00-init.conf.erb'),
-		notify  => Service['ferm'],
+		notify  => Exec['ferm reload'],
 	}
 	file { '/etc/ferm/conf.d/me.conf':
 		content => template('ferm/me.conf.erb'),
-		notify  => Service['ferm'],
+		notify  => Exec['ferm reload'],
 	}
 	file { '/etc/ferm/conf.d/defs.conf':
 		content => template('ferm/defs.conf.erb'),
-		notify  => Service['ferm'],
+		notify  => Exec['ferm reload'],
 	}
 
 	file { '/etc/ferm/conf.d/50-munin-interfaces.conf':
 		content => template('ferm/conf.d-munin-interfaces.conf.erb'),
-		notify  => Service['ferm'],
+		notify  => Exec['ferm reload'],
 	}
 	@ferm::rule { 'dsa-munin-interfaces-in':
 		prio        => '001',
@@ -106,7 +110,7 @@ class ferm {
 
 	file { '/etc/ferm/dsa.d/010-base.conf':
 		content => template('ferm/dsa.d-010-base.conf.erb'),
-		notify  => Service['ferm'],
+		notify  => Exec['ferm reload'],
 	}
 
 	augeas { 'logrotate_ulogd2':