Merged in oherrala/puppet/oherrala-array-not-string (pull request #44)

firewall, gnu, sendmail: Fix "Name must be a String not Array" errors produced by latest Puppet.
This commit is contained in:
Ossi Salmi 2014-02-06 11:36:42 +02:00
commit 75092b2215
3 changed files with 47 additions and 20 deletions

View file

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

View file

@ -10,14 +10,23 @@ class gnu::gcc {
} }
if $::kernel == Linux { if $::kernel == Linux {
package { "kernel-headers": case $::operatingsystem {
name => $::operatingsystem ? { 'debian', 'ubuntu': {
"debian" => "linux-libc-dev", package { "kernel-headers":
"ubuntu" => "linux-libc-dev", name => "linux-libc-dev",
default => [ "kernel-headers", "kernel-devel", ],
},
ensure => installed, ensure => installed,
}
} }
default: {
package { "kernel-headers":
ensure => installed,
require => Package["kernel-devel"],
}
package { "kernel-devel":
ensure => installed,
}
}
}
} }
} }

View file

@ -9,8 +9,11 @@ class sendmail::common {
if $::operatingsystem != "OpenBSD" { if $::operatingsystem != "OpenBSD" {
package { "sendmail": package { "sendmail":
ensure => installed, ensure => installed,
name => [ "sendmail", "sendmail-cf", ],
before => File["/etc/mail/certs"], before => File["/etc/mail/certs"],
require => Package["sendmail-cf"],
}
package { "sendmail-cf":
ensure => installed,
} }
service { "sendmail": service { "sendmail":
ensure => running, ensure => running,