diff --git a/doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html index 935ccb0..90696db 100644 --- a/doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html @@ -111,16 +111,7 @@ 13 14 15 -16 -17 -18 -19 -20 -21 -22 -23 -24 -25 +16
# File 'manifests/firewall/iptables.pp', line 6 @@ -128,17 +119,8 @@ class confdroid_ssh::firewall::iptables ( ) inherits confdroid_ssh::params { - case $ssh_use_firewall { - true, 'true', 'yes', '1': { - $ssh_fw_ensure = 'present' - } - default: { - $ssh_fw_ensure = 'absent' - } - } - firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}": - ensure => $ssh_fw_ensure, + ensure => $ssh_use_firewall, proto => 'tcp', source => $ssh_source_range, dport => $ssh_fw_port, diff --git a/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html b/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html index d7b6f9c..e8a8e1f 100644 --- a/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html @@ -151,15 +151,15 @@ ssh_use_firewall - (Boolean) + (String) - (defaults to: true) + (defaults to: 'present') —-@@ -355,7 +355,6 @@whether to manage firewall settings
+whether set the fw rule to present or absent.
-19 20 21 22 @@ -395,10 +394,11 @@ 56 57 58 -59+59 +60
# File 'manifests/params.pp', line 19
+ # File 'manifests/params.pp', line 20
class confdroid_ssh::params (
@@ -406,7 +406,7 @@ class confdroid_ssh::params (
String $pkg_ensure = 'present',
# firewall settings
- Boolean $ssh_use_firewall = true,
+ String $ssh_use_firewall = 'present',
String $ssh_fw_port = '22',
String $ssh_fw_order = '50',
String $ssh_source_range = '0.0.0.0/0',
diff --git a/manifests/firewall/iptables.pp b/manifests/firewall/iptables.pp
index 4e67d60..150bed5 100644
--- a/manifests/firewall/iptables.pp
+++ b/manifests/firewall/iptables.pp
@@ -6,17 +6,8 @@
class confdroid_ssh::firewall::iptables (
) inherits confdroid_ssh::params {
- case $ssh_use_firewall {
- true, 'true', 'yes', '1': {
- $ssh_fw_ensure = 'present'
- }
- default: {
- $ssh_fw_ensure = 'absent'
- }
- }
-
firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}":
- ensure => $ssh_fw_ensure,
+ ensure => $ssh_use_firewall,
proto => 'tcp',
source => $ssh_source_range,
dport => $ssh_fw_port,
diff --git a/manifests/params.pp b/manifests/params.pp
index 75caa70..22e8a2c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,7 +4,8 @@
# @summary Class contains all class parameters for confdroid_ssh
# @param [Array] ssh_reqpackages packages to install
# @param [String] pkg_ensure version to install: 'present' or 'latest'
-# @param [Boolean] ssh_use_firewall whether to manage firewall settings
+# @param [String] ssh_use_firewall whether set the fw rule to
+# present or absent.
# @param [String] ssh_fw_port port to use for SSHD and in fw
# @param [String] ssh_fw_order order of firewall rule
# @param [String] ssh_source_range source range for firewall rule
@@ -22,7 +23,7 @@ class confdroid_ssh::params (
String $pkg_ensure = 'present',
# firewall settings
- Boolean $ssh_use_firewall = true,
+ String $ssh_use_firewall = 'present',
String $ssh_fw_port = '22',
String $ssh_fw_order = '50',
String $ssh_source_range = '0.0.0.0/0',