Merge branch 'jenkins-build-14' into 'master'
Auto-merge for build 14 See merge request puppet/confdroid_ssh!14
This commit is contained in:
@@ -120,9 +120,7 @@
|
|||||||
22
|
22
|
||||||
23
|
23
|
||||||
24
|
24
|
||||||
25
|
25</pre>
|
||||||
26
|
|
||||||
27</pre>
|
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span>
|
<pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span>
|
||||||
@@ -130,24 +128,22 @@
|
|||||||
class confdroid_ssh::firewall::iptables (
|
class confdroid_ssh::firewall::iptables (
|
||||||
|
|
||||||
) inherits confdroid_ssh::params {
|
) inherits confdroid_ssh::params {
|
||||||
if $ssh_use_firewall == true {
|
case $ssh_use_firewall {
|
||||||
|
true, 'true', 'yes', '1': {
|
||||||
|
$ssh_fw_ensure = 'present'
|
||||||
|
}
|
||||||
|
default: {
|
||||||
|
$ssh_fw_ensure = 'absent'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}":
|
firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}":
|
||||||
ensure => 'present',
|
ensure => $ssh_fw_ensure,
|
||||||
proto => 'tcp',
|
proto => 'tcp',
|
||||||
source => $ssh_source_range,
|
source => $ssh_source_range,
|
||||||
dport => $ssh_fw_port,
|
dport => $ssh_fw_port,
|
||||||
jump => 'accept',
|
jump => 'accept',
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if $ssh_use_firewall == false {
|
|
||||||
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',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}</pre>
|
}</pre>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -6,22 +6,20 @@
|
|||||||
class confdroid_ssh::firewall::iptables (
|
class confdroid_ssh::firewall::iptables (
|
||||||
|
|
||||||
) inherits confdroid_ssh::params {
|
) inherits confdroid_ssh::params {
|
||||||
if $ssh_use_firewall == true {
|
case $ssh_use_firewall {
|
||||||
|
true, 'true', 'yes', '1': {
|
||||||
|
$ssh_fw_ensure = 'present'
|
||||||
|
}
|
||||||
|
default: {
|
||||||
|
$ssh_fw_ensure = 'absent'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}":
|
firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}":
|
||||||
ensure => 'present',
|
ensure => $ssh_fw_ensure,
|
||||||
proto => 'tcp',
|
proto => 'tcp',
|
||||||
source => $ssh_source_range,
|
source => $ssh_source_range,
|
||||||
dport => $ssh_fw_port,
|
dport => $ssh_fw_port,
|
||||||
jump => 'accept',
|
jump => 'accept',
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if $ssh_use_firewall == false {
|
|
||||||
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',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user