projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ferm cleanup: bmdb1:main
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
manifests
/
conf.pp
diff --git
a/modules/ferm/manifests/conf.pp
b/modules/ferm/manifests/conf.pp
index
dd3bb0c
..
d769194
100644
(file)
--- a/
modules/ferm/manifests/conf.pp
+++ b/
modules/ferm/manifests/conf.pp
@@
-1,23
+1,41
@@
-define ferm::conf ($content, $source) {
+#
+define ferm::conf (
+ $source=undef,
+ $content=undef,
+ $ensure=present,
+ $prio="xx-10",
+) {
+ include ferm
case $ensure {
case $ensure {
- present,absent: {}
- default: { fail ( "Invald ensure `${ensure}' for ${name}" ) }
+ present: {
+ if ! ($source or $content) {
+ fail ( "No configuration found for ${name}" )
+ }
+ }
+ absent: {}
+ default: { fail ( "Unknown ensure value: '$ensure'" ) }
}
if ($source and $content) {
fail ( "Can't define both source and content for ${name}" )
}
}
if ($source and $content) {
fail ( "Can't define both source and content for ${name}" )
}
- if $source {
- file { "/etc/ferm/conf.d/${name}":
- ensure => $ensure,
- source => $source
+ $fname = "/etc/ferm/conf.d/${prio}_${name}.conf"
+
+ if $content {
+ file { $fname:
+ ensure => $ensure,
+ mode => '0400',
+ content => $content,
+ notify => Service['ferm'],
}
}
- } elsif $content {
- file { "/etc/ferm/conf.d/${name}":
- ensure => $ensure,
- content => $content,
+ } else {
+ file { $fname:
+ ensure => $ensure,
+ mode => '0400',
+ source => $source,
+ notify => Service['ferm'],
}
}
}
}
}
}