projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use proper directory
[mirror/dsa-puppet.git]
/
modules
/
xinetd
/
manifests
/
service.pp
diff --git
a/modules/xinetd/manifests/service.pp
b/modules/xinetd/manifests/service.pp
index
07a8e58
..
c348579
100644
(file)
--- a/
modules/xinetd/manifests/service.pp
+++ b/
modules/xinetd/manifests/service.pp
@@
-1,13
+1,16
@@
define xinetd::service (
$id,
$server,
define xinetd::service (
$id,
$server,
- $port,
+ $service,
+ $port='',
$bind='',
$bind='',
+ $type='',
$socket_type=stream,
$protocol=tcp,
$socket_type=stream,
$protocol=tcp,
- $flags=
IPv6
,
+ $flags=
''
,
$wait=no,
$user=root,
$wait=no,
$user=root,
+ $group='',
$server_args='',
$nice=10,
$instances=100,
$server_args='',
$nice=10,
$instances=100,
@@
-18,38
+21,25
@@
define xinetd::service (
) {
include xinetd
) {
include xinetd
- $noop = $::hostname ? {
- bizet => false,
- franck => false,
- gluck => false,
- lobos => false,
- klecker => false,
- ravel => false,
- saens => false,
- santoro => false,
- schein => false,
- steffani => false,
- villa => false,
- wieck => false,
- morricone => false,
- default => true
- }
-
case $ensure {
present,absent,file: {}
default: { fail("Invalid ensure for '$name'") }
}
if $ferm {
case $ensure {
present,absent,file: {}
default: { fail("Invalid ensure for '$name'") }
}
if $ferm {
+ $fermport = $port ? {
+ "" => $service,
+ default => $port
+ }
+
@ferm::rule { "dsa-xinetd-${name}":
@ferm::rule { "dsa-xinetd-${name}":
- description => "Allow traffic to ${
port
}",
- rule => "&SERVICE(${protocol}, ${port})"
+ description => "Allow traffic to ${
service
}",
+ rule => "&SERVICE(${protocol}, ${
ferm
port})"
}
}
file { "/etc/xinetd.d/${name}":
ensure => $ensure,
}
}
file { "/etc/xinetd.d/${name}":
ensure => $ensure,
- noop => $noop,
content => template('xinetd/service.erb'),
notify => Service['xinetd'],
require => Package['xinetd'],
content => template('xinetd/service.erb'),
notify => Service['xinetd'],
require => Package['xinetd'],