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

Auto-merge for build 11 See merge request puppet/confdroid_ssh!11
Recommit for updates in build 11
2026-04-09 14:27:13 +02:00 · 2026-04-09 14:20:15 +02:00 · 2026-04-09 14:19:21 +02:00 · 2026-04-09 14:19:04 +02:00 · 2026-04-09 12:16:21 +00:00
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 (
    }
  }
 }
-
Author	SHA1	Message	Date
Jenkins	b13a7f7c6a	Merge branch 'jenkins-build-11' into 'master' Auto-merge for build 11 See merge request puppet/confdroid_ssh!11	2026-04-09 14:27:13 +02:00
Jenkins Server	a5b60a4418	Recommit for updates in build 11	2026-04-09 14:20:15 +02:00
Jenkins Server	cce6b6bb1b	Merge remote-tracking branch 'origin/master' into jenkins-build-11	2026-04-09 14:19:21 +02:00
12ww1160	493f8fc2eb	OP#561 fix fw setting	2026-04-09 14:19:04 +02:00
Jenkins	374852537d	Merge branch 'jenkins-build-10' into 'master' Auto-merge for build 10 See merge request puppet/confdroid_ssh!10	2026-04-09 12:16:21 +00:00