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:
2c0d739
)
ferm::conf - merge with tor version
author
Peter Palfrader
<peter@palfrader.org>
Tue, 6 Mar 2018 12:30:25 +0000
(13:30 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Tue, 6 Mar 2018 12:30:25 +0000
(13:30 +0100)
modules/ferm/manifests/conf.pp
patch
|
blob
|
history
diff --git
a/modules/ferm/manifests/conf.pp
b/modules/ferm/manifests/conf.pp
index
0dffa77
..
602b74b
100644
(file)
--- a/
modules/ferm/manifests/conf.pp
+++ b/
modules/ferm/manifests/conf.pp
@@
-1,29
+1,39
@@
-define ferm::conf ($content=undef, $source=undef, $ensure=present) {
-
- include ferm
-
+#
+define ferm::conf (
+ $source=undef,
+ $content=undef,
+ $ensure=present,
+ $prio="xx-10",
+) {
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}" )
}
- $fname = "/etc/ferm/conf.d/${name}.conf"
+ $fname = "/etc/ferm/conf.d/${
prio}_${
name}.conf"
- if $
source
{
+ if $
content
{
file { $fname:
file { $fname:
- ensure => $ensure,
- source => $source,
- notify => Service['ferm']
+ ensure => $ensure,
+ mode => '0400',
+ content => $content,
+ notify => Exec["ferm restart"],
}
}
- } els
if $content
{
+ } els
e
{
file { $fname:
file { $fname:
- ensure => $ensure,
- content => $content,
- notify => Service['ferm']
+ ensure => $ensure,
+ mode => '0400',
+ source => $source,
+ notify => Exec["ferm restart"],
}
}
}
}
}
}