Skip to content

Commit 486e4b5

Browse files
committed
Package_Name param was used in a clever way, moved to iptables_name
1 parent d677c5a commit 486e4b5

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

manifests/linux.pp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
$service_name_v6 = $firewall::params::service_name_v6,
3232
$package_name = $firewall::params::package_name,
3333
$ebtables_manage = false,
34+
$iptables_name = $firewall::params::iptables_name,
3435
) inherits ::firewall::params {
3536
$enable = $ensure ? {
3637
'running' => true,
@@ -45,7 +46,7 @@
4546
}
4647

4748
package { 'iptables':
48-
name => $package_name,
49+
name => $iptables_name,
4950
ensure => $pkg_ensure,
5051
}
5152

manifests/params.pp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,20 @@
1111
$service_name = 'iptables'
1212
$service_name_v6 = 'ip6tables'
1313
$package_name = undef
14+
$iptables_name = 'iptables'
1415
$sysconfig_manage = true
1516
}
1617
'Fedora': {
1718
$service_name = 'iptables'
1819
$service_name_v6 = 'ip6tables'
1920
if versioncmp($::operatingsystemrelease, '34') >= 0 {
20-
$package_name = 'iptables-compat'
21+
$package_name = 'iptables-services'
22+
$iptables_name = 'iptables-compat'
2123
} elsif versioncmp($::operatingsystemrelease, '15') >= 0 {
2224
$package_name = 'iptables-services'
25+
$iptables_name = 'iptables'
2326
} else {
27+
$iptables_name = 'iptables'
2428
$package_name = undef
2529
}
2630
$sysconfig_manage = true
@@ -30,23 +34,27 @@
3034
$service_name = ['iptables', 'nftables']
3135
$service_name_v6 = 'ip6tables'
3236
$package_name = ['iptables-services', 'nftables']
37+
$iptables_name = 'iptables'
3338
$sysconfig_manage = false
3439
} elsif versioncmp($::operatingsystemrelease, '7.0') >= 0 {
3540
$service_name = 'iptables'
3641
$service_name_v6 = 'ip6tables'
3742
$package_name = 'iptables-services'
43+
$iptables_name = 'iptables'
3844
$sysconfig_manage = true
3945
} else {
4046
$service_name = 'iptables'
4147
$service_name_v6 = 'ip6tables'
4248
$package_name = 'iptables-ipv6'
49+
$iptables_name = 'iptables'
4350
$sysconfig_manage = true
4451
}
4552
}
4653
}
4754
}
4855
'Debian': {
4956
$service_name_v6 = undef
57+
$iptables_name = 'iptables'
5058
case $::operatingsystem {
5159
'Debian': {
5260
if versioncmp($::operatingsystemrelease, 'unstable') >= 0 {
@@ -81,6 +89,7 @@
8189
$package_name = 'net-firewall/iptables'
8290
}
8391
default: {
92+
$iptables_name = 'iptables'
8493
$service_name_v6 = undef
8594
case $::operatingsystem {
8695
'Archlinux': {

0 commit comments

Comments
 (0)