Merge branch 'master' of bitbucket.org:tmakinen/puppet
This commit is contained in:
commit
efd0076b65
1 changed files with 2 additions and 2 deletions
|
@ -161,7 +161,7 @@ class firewall::common::iptables {
|
||||||
require => Package["iptables"],
|
require => Package["iptables"],
|
||||||
}
|
}
|
||||||
|
|
||||||
if $ip6tables and $::ipaddress6 {
|
if $ip6tables {
|
||||||
file { $ip6tables:
|
file { $ip6tables:
|
||||||
ensure => present,
|
ensure => present,
|
||||||
mode => "0600",
|
mode => "0600",
|
||||||
|
@ -207,7 +207,7 @@ class firewall::iptables inherits firewall::common::iptables {
|
||||||
content => template("firewall/iptables.erb"),
|
content => template("firewall/iptables.erb"),
|
||||||
}
|
}
|
||||||
|
|
||||||
if $firewall::common::iptables::ip6tables and $::ipaddress6 {
|
if $firewall::common::iptables::ip6tables {
|
||||||
File[$firewall::common::iptables::ip6tables] {
|
File[$firewall::common::iptables::ip6tables] {
|
||||||
content => template("firewall/ip6tables.erb"),
|
content => template("firewall/ip6tables.erb"),
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue