Recommit for updates in build 15
This commit is contained in:
@@ -111,16 +111,7 @@
|
|||||||
13
|
13
|
||||||
14
|
14
|
||||||
15
|
15
|
||||||
16
|
16</pre>
|
||||||
17
|
|
||||||
18
|
|
||||||
19
|
|
||||||
20
|
|
||||||
21
|
|
||||||
22
|
|
||||||
23
|
|
||||||
24
|
|
||||||
25</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>
|
||||||
@@ -128,17 +119,8 @@
|
|||||||
class confdroid_ssh::firewall::iptables (
|
class confdroid_ssh::firewall::iptables (
|
||||||
|
|
||||||
) inherits confdroid_ssh::params {
|
) inherits confdroid_ssh::params {
|
||||||
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 => $ssh_fw_ensure,
|
ensure => $ssh_use_firewall,
|
||||||
proto => 'tcp',
|
proto => 'tcp',
|
||||||
source => $ssh_source_range,
|
source => $ssh_source_range,
|
||||||
dport => $ssh_fw_port,
|
dport => $ssh_fw_port,
|
||||||
|
|||||||
@@ -151,15 +151,15 @@
|
|||||||
<span class='name'>ssh_use_firewall</span>
|
<span class='name'>ssh_use_firewall</span>
|
||||||
|
|
||||||
|
|
||||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
<span class='type'>(<tt>String</tt>)</span>
|
||||||
|
|
||||||
|
|
||||||
<em class="default">(defaults to: <tt>true</tt>)</em>
|
<em class="default">(defaults to: <tt>'present'</tt>)</em>
|
||||||
|
|
||||||
|
|
||||||
—
|
—
|
||||||
<div class='inline'>
|
<div class='inline'>
|
||||||
<p>whether to manage firewall settings</p>
|
<p>whether set the fw rule to present or absent.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
@@ -355,7 +355,6 @@
|
|||||||
<pre class="lines">
|
<pre class="lines">
|
||||||
|
|
||||||
|
|
||||||
19
|
|
||||||
20
|
20
|
||||||
21
|
21
|
||||||
22
|
22
|
||||||
@@ -395,10 +394,11 @@
|
|||||||
56
|
56
|
||||||
57
|
57
|
||||||
58
|
58
|
||||||
59</pre>
|
59
|
||||||
|
60</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 19</span>
|
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 20</span>
|
||||||
|
|
||||||
class confdroid_ssh::params (
|
class confdroid_ssh::params (
|
||||||
|
|
||||||
@@ -406,7 +406,7 @@ class confdroid_ssh::params (
|
|||||||
String $pkg_ensure = 'present',
|
String $pkg_ensure = 'present',
|
||||||
|
|
||||||
# firewall settings
|
# firewall settings
|
||||||
Boolean $ssh_use_firewall = true,
|
String $ssh_use_firewall = 'present',
|
||||||
String $ssh_fw_port = '22',
|
String $ssh_fw_port = '22',
|
||||||
String $ssh_fw_order = '50',
|
String $ssh_fw_order = '50',
|
||||||
String $ssh_source_range = '0.0.0.0/0',
|
String $ssh_source_range = '0.0.0.0/0',
|
||||||
|
|||||||
Reference in New Issue
Block a user