From: Stephen Gran <steve@lobefin.net>
Date: Tue, 11 Sep 2012 18:45:40 +0000 (+0100)
Subject: I want this to end in .conf
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c1737f93d1e1b2571c76ee69c48994bafbd12849;p=mirror%2Fdsa-puppet.git

I want this to end in .conf

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/ferm/manifests/conf.pp b/modules/ferm/manifests/conf.pp
index d4e4ad9fd..a97d4a930 100644
--- a/modules/ferm/manifests/conf.pp
+++ b/modules/ferm/manifests/conf.pp
@@ -9,13 +9,15 @@ define ferm::conf ($content=undef, $source=undef, $ensure=present) {
 		fail ( "Can't define both source and content for ${name}" )
 	}
 
+	$fname = "/etc/ferm/conf.d/${name}.conf"
+
 	if $source {
-		file { "/etc/ferm/conf.d/${name}":
+		file { $fname:
 			ensure => $ensure,
 			source => $source
 		}
 	} elsif $content {
-		file { "/etc/ferm/conf.d/${name}":
+		file { $fname:
 			ensure  => $ensure,
 			content => $content,
 		}