projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move logging and related/established out of ferm.conf into a dsa.d rule
[mirror/dsa-puppet.git]
/
modules
/
xinetd
/
manifests
/
service.pp
diff --git
a/modules/xinetd/manifests/service.pp
b/modules/xinetd/manifests/service.pp
index
0f0b4a6
..
9924761
100644
(file)
--- a/
modules/xinetd/manifests/service.pp
+++ b/
modules/xinetd/manifests/service.pp
@@
-19,12
+19,13
@@
define xinetd::service (
$ensure=present,
$ferm=true
) {
$ensure=present,
$ferm=true
) {
- case $ensure {
- present,file: {
- include xinetd
- }
- absent: {}
- default: { fail("Invalid ensure for '$name'") }
+ include xinetd
+
+ file { "/etc/xinetd.d/${name}":
+ ensure => $ensure,
+ content => template('xinetd/service.erb'),
+ notify => Service['xinetd'],
+ require => Package['xinetd'],
}
if $ferm {
}
if $ferm {
@@
-38,11
+39,4
@@
define xinetd::service (
rule => "&SERVICE(${protocol}, ${fermport})"
}
}
rule => "&SERVICE(${protocol}, ${fermport})"
}
}
-
- file { "/etc/xinetd.d/${name}":
- ensure => $ensure,
- content => template('xinetd/service.erb'),
- notify => Service['xinetd'],
- require => Package['xinetd'],
- }
}
}