firewall, gnu, sendmail: Fix "Name must be a String not Array" errors produced by latest Puppet.

This commit is contained in:
Ossi Herrala 2014-02-05 15:00:49 +00:00
parent 532e48ba2c
commit 362bc66d15
3 changed files with 47 additions and 20 deletions

View file

@ -122,19 +122,34 @@ class firewall::common::iptables {
}
}
package { "iptables":
ensure => installed,
name => $::operatingsystem ? {
"centos" => [ "iptables", "iptables-ipv6" ],
"redhat" => [ "iptables", "iptables-ipv6" ],
"debian" => [ "iptables", "iptables-persistent" ],
"fedora" => $::operatingsystemrelease ? {
/^1[0-5]/ => [ "iptables", "iptables-ipv6" ],
/^1[6-7]/ => "iptables",
default => [ "iptables", "iptables-services" ],
},
"ubuntu" => [ "iptables", "iptables-persistent" ],
},
case $::operatingsystem {
'debian', 'ubuntu': {
package { "iptables":
ensure => installed,
require => Package["iptables-persistent"],
}
package { "iptables-persistent":
ensure => installed,
}
}
'centos','redhat': {
package { "iptables":
ensure => installed,
require => Package["iptables-ipv6"],
}
package { "iptables-ipv6":
ensure => installed,
}
}
'fedora': {
package { "iptables":
ensure => installed,
require => Package["iptables-services"],
}
package { "iptables-services":
ensure => installed,
}
}
}
file { $iptables: