projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mirror-anu must not be in apache2_www_mirror if it is in static
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
manifests
/
conf.pp
diff --git
a/modules/ferm/manifests/conf.pp
b/modules/ferm/manifests/conf.pp
index
a97ec69
..
0dffa77
100644
(file)
--- a/
modules/ferm/manifests/conf.pp
+++ b/
modules/ferm/manifests/conf.pp
@@
-1,4
+1,6
@@
-define ferm::conf ($content=undef, $source=undef) {
+define ferm::conf ($content=undef, $source=undef, $ensure=present) {
+
+ include ferm
case $ensure {
present,absent: {}
case $ensure {
present,absent: {}
@@
-9,15
+11,19
@@
define ferm::conf ($content=undef, $source=undef) {
fail ( "Can't define both source and content for ${name}" )
}
fail ( "Can't define both source and content for ${name}" )
}
+ $fname = "/etc/ferm/conf.d/${name}.conf"
+
if $source {
if $source {
- file {
"/etc/ferm/conf.d/${name}"
:
+ file {
$fname
:
ensure => $ensure,
ensure => $ensure,
- source => $source
+ source => $source,
+ notify => Service['ferm']
}
} elsif $content {
}
} elsif $content {
- file {
"/etc/ferm/conf.d/${name}"
:
+ file {
$fname
:
ensure => $ensure,
content => $content,
ensure => $ensure,
content => $content,
+ notify => Service['ferm']
}
}
}
}
}
}