projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
buildd: provide sbuild.conf with ASPCUD criteria
[mirror/dsa-puppet.git]
/
modules
/
xinetd
/
manifests
/
service.pp
diff --git
a/modules/xinetd/manifests/service.pp
b/modules/xinetd/manifests/service.pp
index
3dbc8cb
..
c348579
100644
(file)
--- a/
modules/xinetd/manifests/service.pp
+++ b/
modules/xinetd/manifests/service.pp
@@
-1,13
+1,16
@@
define xinetd::service (
define xinetd::service (
- $bind,
$id,
$server,
$id,
$server,
- $port,
+ $service,
+ $port='',
+ $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,
@@
-24,15
+27,19
@@
define xinetd::service (
}
if $ferm {
}
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}
.conf
":
+ file { "/etc/xinetd.d/${name}":
ensure => $ensure,
ensure => $ensure,
- noop => true,
content => template('xinetd/service.erb'),
notify => Service['xinetd'],
require => Package['xinetd'],
content => template('xinetd/service.erb'),
notify => Service['xinetd'],
require => Package['xinetd'],