projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc9ce0f
)
I want this to end in .conf
author
Stephen Gran
<steve@lobefin.net>
Tue, 11 Sep 2012 18:45:40 +0000
(19:45 +0100)
committer
Stephen Gran
<steve@lobefin.net>
Tue, 11 Sep 2012 18:45:40 +0000
(19:45 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/ferm/manifests/conf.pp
patch
|
blob
|
history
diff --git
a/modules/ferm/manifests/conf.pp
b/modules/ferm/manifests/conf.pp
index
d4e4ad9
..
a97d4a9
100644
(file)
--- 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,
}