projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restrict stunnel to debian hosts, II
[mirror/dsa-puppet.git]
/
modules
/
stunnel4
/
manifests
/
init.pp
diff --git
a/modules/stunnel4/manifests/init.pp
b/modules/stunnel4/manifests/init.pp
index
36b5ce0
..
a71d34f
100644
(file)
--- a/
modules/stunnel4/manifests/init.pp
+++ b/
modules/stunnel4/manifests/init.pp
@@
-29,9
+29,14
@@
class stunnel4 {
@ferm::rule {
"stunnel-${name}":
description => "stunnel ${name}",
@ferm::rule {
"stunnel-${name}":
description => "stunnel ${name}",
- rule => "&TCP_UDP_SERVICE(${accept})",
- domain => "(ip ip6)",
- ;
+ rule => "&SERVICE_RANGE(tcp, ${accept}, \$HOST_DEBIAN_V4)",
+ }
+ @ferm::rule {
+ "stunnel-${name}-v6":
+ domain => 'ip6',
+ description => "stunnel ${name}",
+ rule => "&SERVICE_RANGE(tcp, ${accept}, \$HOST_DEBIAN_V6)",
+ }
}
}
define stunnel_client($accept, $connecthost, $connectport) {
}
}
define stunnel_client($accept, $connecthost, $connectport) {
@@
-63,6
+68,7
@@
class stunnel4 {
file {
"/etc/stunnel/stunnel.conf":
ensure => absent,
file {
"/etc/stunnel/stunnel.conf":
ensure => absent,
+ require => [ Package['stunnel4'] ],
;
}
;
}