debian init script does not have a status cmd :/

This commit is contained in:
mh 2012-02-09 18:07:19 +01:00
parent f55cfe6187
commit ca4d2a5f04
3 changed files with 14 additions and 7 deletions

7
manifests/debian.pp Normal file
View file

@ -0,0 +1,7 @@
class tinc::debian inherits tinc::base {
Service['tinc'] {
hasstatus => false,
pattern => 'tincd',
hasrestart => true
}
}

View file

@ -1,8 +1,9 @@
class tinc {
require bridge-utils
case $::operatingsystem {
centos : { include tinc::centos }
default : { include tinc::base }
centos: { include tinc::centos }
debian: { include tinc::debian }
default: { include tinc::base }
}
if hiera('use_shorewall', false) {
include shorewall::rules::tinc

View file

@ -133,12 +133,11 @@ define tinc::vpn_net(
if hiera('use_shorewall',false) {
$real_shorewall_zone = $shorewall_zone ? {
'absent' => 'loc',
default => $shorewall_zone
}
shorewall::interface { "${real_tinc_bridge_interface}":
zone => "${real_shorewall_zone}",
zone => $shorewall_zone ? {
'absent' => 'loc',
default => $shorewall_zone
},
rfc1918 => true,
options => 'routeback,logmartians';
}