From 493f8fc2ebb9b006287c1c53acde6e161b5fd83c Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Thu, 9 Apr 2026 14:19:04 +0200 Subject: [PATCH 1/2] OP#561 fix fw setting --- manifests/firewall/iptables.pp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifests/firewall/iptables.pp b/manifests/firewall/iptables.pp index 665441d..42da410 100644 --- 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 ( } } } - From a5b60a4418357982c64c836545174528f3628436 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 9 Apr 2026 14:20:15 +0200 Subject: [PATCH 2/2] Recommit for updates in build 11 --- .../confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0f23945..72537f1 100644 --- 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 => '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',