Merge branch 'jenkins-build-11' into 'master'

Auto-merge for build 11 See merge request puppet/confdroid_ssh!11
2026-04-09 12:20:21 +00:00
parent 374852537d a5b60a4418
commit 1923be5664
2 changed files with 2 additions and 3 deletions
--- a/doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html
@@ -139,7 +139,7 @@ class confdroid_ssh::firewall::iptables (
      jump   =&gt; &#39;accept&#39;,
    }
  }
-  else {
+  if $ssh_use_firewall == false {
    firewall { &quot;${ssh_fw_order}${ssh_fw_port} remove SSH on port ${ssh_fw_port}&quot;:
      ensure =&gt; &#39;absent&#39;,
      proto  =&gt; &#39;tcp&#39;,
--- a/manifests/firewall/iptables.pp
+++ b/manifests/firewall/iptables.pp
@@ -15,7 +15,7 @@ class confdroid_ssh::firewall::iptables (
      jump   => 'accept',
    }
  }
-  else {
+  if $ssh_use_firewall == false {
    firewall { "${ssh_fw_order}${ssh_fw_port} remove SSH on port ${ssh_fw_port}":
      ensure => 'absent',
      proto  => 'tcp',
@@ -25,4 +25,3 @@ class confdroid_ssh::firewall::iptables (
    }
  }
 }
-