From 46898aa67967db316f8fc37a2f09edf9e390433d Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Thu, 9 Apr 2026 14:12:26 +0200 Subject: [PATCH 1/2] OP#561 fix fw setting --- manifests/firewall/iptables.pp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/manifests/firewall/iptables.pp b/manifests/firewall/iptables.pp index a43728e..400b418 100644 --- a/manifests/firewall/iptables.pp +++ b/manifests/firewall/iptables.pp @@ -6,7 +6,7 @@ class confdroid_ssh::firewall::iptables ( ) inherits confdroid_ssh::params { - if $ssh_use_firewall { + if $ssh_use_firewall == true { firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}": ensure => 'present', proto => 'tcp', @@ -14,5 +14,14 @@ class confdroid_ssh::firewall::iptables ( dport => $ssh_fw_port, jump => 'accept', } + else { + firewall { "${ssh_fw_order}${ssh_fw_port} remove SSH on port ${ssh_fw_port}": + ensure => 'absent', + proto => 'tcp', + source => $ssh_source_range, + dport => $ssh_fw_port, + jump => 'accept', + } + } } } From 28e0acd73ceac69c40dfd077a1b5ce335aef87a9 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 9 Apr 2026 14:13:43 +0200 Subject: [PATCH 2/2] Recommit for updates in build 9 --- doc/_index.html | 5 ----- doc/puppet_class_list.html | 21 +++++++------------ .../confdroid_ssh_3A_3Aparams.html | 2 -- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/doc/_index.html b/doc/_index.html index f5b0f9a..b9c274a 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -73,11 +73,6 @@ -
  • - confdroid_ssh::firewall::iptables - -
    • -
  • confdroid_ssh::main::config diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 5557e96..87e5d2f 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -43,56 +43,49 @@
    • -
  • -
    - confdroid_ssh::firewall::iptables -
    -
    • - - -
  • +
  • confdroid_ssh::main::config
    • -
  • +
  • confdroid_ssh::main::dirs
    • -
  • +
  • confdroid_ssh::main::files
    • -
  • +
  • confdroid_ssh::main::install
    • -
  • +
  • confdroid_ssh::main::service
    • -
  • +
  • confdroid_ssh::params
    • -
  • +
  • confdroid_ssh::selinux::semanage
    diff --git a/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html b/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html index d7b6f9c..501f091 100644 --- a/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_ssh_3A_3Aparams.html @@ -79,8 +79,6 @@ confdroid_ssh::selinux::semanage
    - confdroid_ssh::firewall::iptables
    -