From 7049093171e724fc7fa26eb834f27dc9adf78969 Mon Sep 17 00:00:00 2001
From: 12ww1160 <12ww1160@confdroid.com>
Date: Thu, 9 Apr 2026 14:25:58 +0200
Subject: [PATCH 1/3] OP#561 fix fw setting

---
 manifests/firewall/iptables.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/firewall/iptables.pp b/manifests/firewall/iptables.pp
index 42da410..d7b0dcf 100644
--- a/manifests/firewall/iptables.pp
+++ b/manifests/firewall/iptables.pp
@@ -15,7 +15,7 @@ class confdroid_ssh::firewall::iptables (
       jump   => 'accept',
     }
   }
-  if $ssh_use_firewall == false {
+  if $ssh_use_firewall != true {
     firewall { "${ssh_fw_order}${ssh_fw_port} remove SSH on port ${ssh_fw_port}":
       ensure => 'absent',
       proto  => 'tcp',

From 5481c3619828d43bcbae77d2d56e74974c26a9a7 Mon Sep 17 00:00:00 2001
From: 12ww1160 <12ww1160@confdroid.com>
Date: Thu, 9 Apr 2026 14:32:06 +0200
Subject: [PATCH 2/3] OP#561 fix fw setting

---
 manifests/firewall/iptables.pp | 2 +-
 manifests/main/service.pp      | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/manifests/firewall/iptables.pp b/manifests/firewall/iptables.pp
index d7b0dcf..42da410 100644
--- a/manifests/firewall/iptables.pp
+++ b/manifests/firewall/iptables.pp
@@ -15,7 +15,7 @@ class confdroid_ssh::firewall::iptables (
       jump   => 'accept',
     }
   }
-  if $ssh_use_firewall != true {
+  if $ssh_use_firewall == false {
     firewall { "${ssh_fw_order}${ssh_fw_port} remove SSH on port ${ssh_fw_port}":
       ensure => 'absent',
       proto  => 'tcp',
diff --git a/manifests/main/service.pp b/manifests/main/service.pp
index 7d1a318..46d850f 100644
--- a/manifests/main/service.pp
+++ b/manifests/main/service.pp
@@ -7,9 +7,7 @@ class confdroid_ssh::main::service (
 ) inherits confdroid_ssh::params {
   require confdroid_ssh::main::files
   require confdroid_ssh::selinux::semanage
-  if $ssh_use_firewall {
-    require confdroid_ssh::firewall::iptables
-  }
+  require confdroid_ssh::firewall::iptables
 
   service { $sshd_service:
     ensure     => running,

From 8353748191b9220ec49c08ec3b0aaaf7a7e32f5d Mon Sep 17 00:00:00 2001
From: Jenkins Server <jenkins@confdroid.com>
Date: Thu, 9 Apr 2026 14:33:23 +0200
Subject: [PATCH 3/3] Recommit for updates in build 13

---
 .../confdroid_ssh_3A_3Amain_3A_3Aservice.html             | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/doc/puppet_classes/confdroid_ssh_3A_3Amain_3A_3Aservice.html b/doc/puppet_classes/confdroid_ssh_3A_3Amain_3A_3Aservice.html
index aea60d2..867a2e0 100644
--- a/doc/puppet_classes/confdroid_ssh_3A_3Amain_3A_3Aservice.html
+++ b/doc/puppet_classes/confdroid_ssh_3A_3Amain_3A_3Aservice.html
@@ -113,9 +113,7 @@
 15
 16
 17
-18
-19
-20</pre>
+18</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span>
@@ -124,9 +122,7 @@ class confdroid_ssh::main::service (
 ) inherits confdroid_ssh::params {
   require confdroid_ssh::main::files
   require confdroid_ssh::selinux::semanage
-  if $ssh_use_firewall {
-    require confdroid_ssh::firewall::iptables
-  }
+  require confdroid_ssh::firewall::iptables
 
   service { $sshd_service:
     ensure     =&gt; running,