From 94afeda0bb8790581813df9fa39fa363cd8f7457 Mon Sep 17 00:00:00 2001
From: 12ww1160 <12ww1160@confdroid.com>
Date: Thu, 9 Apr 2026 15:00:41 +0200
Subject: [PATCH] OP#561 try new  fw settings

---
 manifests/firewall/iptables.pp | 11 +----------
 manifests/params.pp            |  5 +++--
 2 files changed, 4 insertions(+), 12 deletions(-)

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',