confdroid/confdroid_ssh
1
0
Fork 0
Code Issues Projects Wiki Activity

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

Browse Source 
Auto-merge for build 11

See merge request puppet/confdroid_ssh!11
This commit is contained in:
Jenkins
2026-04-09 12:20:21 +00:00
parent 374852537d a5b60a4418
commit 1923be5664
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html
View File

@@ -139,7 +139,7 @@ class confdroid_ssh::firewall::iptables (
jump => 'accept', jump => 'accept',
} }
} }
else { if $ssh_use_firewall == false {
firewall { "${ssh_fw_order}${ssh_fw_port} remove SSH on port ${ssh_fw_port}": firewall { "${ssh_fw_order}${ssh_fw_port} remove SSH on port ${ssh_fw_port}":
ensure => 'absent', ensure => 'absent',
proto => 'tcp', proto => 'tcp',

3
manifests/firewall/iptables.pp
View File

@@ -15,7 +15,7 @@ class confdroid_ssh::firewall::iptables (
jump => 'accept', jump => 'accept',
} }
} }
else { if $ssh_use_firewall == false {
firewall { "${ssh_fw_order}${ssh_fw_port} remove SSH on port ${ssh_fw_port}": firewall { "${ssh_fw_order}${ssh_fw_port} remove SSH on port ${ssh_fw_port}":
ensure => 'absent', ensure => 'absent',
proto => 'tcp', proto => 'tcp',
@@ -25,4 +25,3 @@ class confdroid_ssh::firewall::iptables (
} }
} }
} }