tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed firewall module for Fedora 18.

Browse source
This commit is contained in:
Timo Mkinen 2013-01-17 11:17:51 +02:00
parent d030bd2d78
commit b5a9073efb
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
firewall/manifests/init.pp
View file

@ -111,6 +111,13 @@ class firewall::common::iptables {
} }
$ip6states = versioncmp($::kernelversion, "2.6.20") $ip6states = versioncmp($::kernelversion, "2.6.20")
if $::operatingsystem == "Fedora" and $::operatingsystemrelease > 17 {
package { "firewalld":
ensure => absent,
before => Package["iptables"],
}
}
package { "iptables": package { "iptables":
ensure => installed, ensure => installed,
name => $::operatingsystem ? { name => $::operatingsystem ? {
@ -119,7 +126,8 @@ class firewall::common::iptables {
"debian" => [ "iptables", "iptables-persistent" ], "debian" => [ "iptables", "iptables-persistent" ],
"fedora" => $::operatingsystemrelease ? { "fedora" => $::operatingsystemrelease ? {
/^1[0-5]/ => [ "iptables", "iptables-ipv6" ], /^1[0-5]/ => [ "iptables", "iptables-ipv6" ],
default => "iptables", /^1[6-7]/ => "iptables",
default => [ "iptables", "iptables-services" ],
}, },
"ubuntu" => [ "iptables", "iptables-persistent" ], "ubuntu" => [ "iptables", "iptables-persistent" ],
}, },