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

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

Browse Source 
Auto-merge for build 15

See merge request puppet/confdroid_ssh!15
This commit is contained in:
Jenkins
2026-04-09 13:01:57 +00:00
parent 9d39c1b1d5 b8d581e00d
commit 42fa991975
4 changed files with 13 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html
View File

@@ -111,16 +111,7 @@
13
14
15
16
17
18
19
20
21
22
23
24
25</pre>
16</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span>
@@ -128,17 +119,8 @@
class confdroid_ssh::firewall::iptables (
) inherits confdroid_ssh::params {
case $ssh_use_firewall {
true, &#39;true&#39;, &#39;yes&#39;, &#39;1&#39;: {
$ssh_fw_ensure = &#39;present&#39;
}
default: {
$ssh_fw_ensure = &#39;absent&#39;
}
}
firewall { &quot;${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}&quot;:
ensure =&gt; $ssh_fw_ensure,
ensure =&gt; $ssh_use_firewall,
proto =&gt; &#39;tcp&#39;,
source =&gt; $ssh_source_range,
dport =&gt; $ssh_fw_port,

14
doc/puppet_classes/confdroid_ssh_3A_3Aparams.html
View File

@@ -151,15 +151,15 @@
<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>&#39;present&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>whether to manage firewall settings</p>
<p>whether set the fw rule to present or absent.</p>
</div>
</li>
@@ -355,7 +355,6 @@
<pre class="lines">
19
20
21
22
@@ -395,10 +394,11 @@
56
57
58
59</pre>
59
60</pre>
</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 (
@@ -406,7 +406,7 @@ class confdroid_ssh::params (
String $pkg_ensure = &#39;present&#39;,
# firewall settings
Boolean $ssh_use_firewall = true,
String $ssh_use_firewall = &#39;present&#39;,
String $ssh_fw_port = &#39;22&#39;,
String $ssh_fw_order = &#39;50&#39;,
String $ssh_source_range = &#39;0.0.0.0/0&#39;,

11
manifests/firewall/iptables.pp
View File

@@ -6,17 +6,8 @@
class confdroid_ssh::firewall::iptables (
) 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}":
ensure => $ssh_fw_ensure,
ensure => $ssh_use_firewall,
proto => 'tcp',
source => $ssh_source_range,
dport => $ssh_fw_port,

5
manifests/params.pp
View File

@@ -4,7 +4,8 @@
# @summary Class contains all class parameters for confdroid_ssh
# @param [Array] ssh_reqpackages packages to install
# @param [String] pkg_ensure version to install: 'present' or 'latest'
# @param [Boolean] ssh_use_firewall whether to manage firewall settings
# @param [String] ssh_use_firewall whether set the fw rule to
# present or absent.
# @param [String] ssh_fw_port port to use for SSHD and in fw
# @param [String] ssh_fw_order order of firewall rule
# @param [String] ssh_source_range source range for firewall rule
@@ -22,7 +23,7 @@ class confdroid_ssh::params (
String $pkg_ensure = 'present',
# firewall settings
Boolean $ssh_use_firewall = true,
String $ssh_use_firewall = 'present',
String $ssh_fw_port = '22',
String $ssh_fw_order = '50',
String $ssh_source_range = '0.0.0.0/0',