Merge branch 'jenkins-build-13' into 'master'
Auto-merge for build 13 See merge request puppet/confdroid_ssh!13
This commit is contained in:
@@ -113,9 +113,7 @@
|
|||||||
15
|
15
|
||||||
16
|
16
|
||||||
17
|
17
|
||||||
18
|
18</pre>
|
||||||
19
|
|
||||||
20</pre>
|
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span>
|
<pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span>
|
||||||
@@ -124,9 +122,7 @@ class confdroid_ssh::main::service (
|
|||||||
) inherits confdroid_ssh::params {
|
) inherits confdroid_ssh::params {
|
||||||
require confdroid_ssh::main::files
|
require confdroid_ssh::main::files
|
||||||
require confdroid_ssh::selinux::semanage
|
require confdroid_ssh::selinux::semanage
|
||||||
if $ssh_use_firewall {
|
|
||||||
require confdroid_ssh::firewall::iptables
|
require confdroid_ssh::firewall::iptables
|
||||||
}
|
|
||||||
|
|
||||||
service { $sshd_service:
|
service { $sshd_service:
|
||||||
ensure => running,
|
ensure => running,
|
||||||
|
|||||||
@@ -7,9 +7,7 @@ class confdroid_ssh::main::service (
|
|||||||
) inherits confdroid_ssh::params {
|
) inherits confdroid_ssh::params {
|
||||||
require confdroid_ssh::main::files
|
require confdroid_ssh::main::files
|
||||||
require confdroid_ssh::selinux::semanage
|
require confdroid_ssh::selinux::semanage
|
||||||
if $ssh_use_firewall {
|
|
||||||
require confdroid_ssh::firewall::iptables
|
require confdroid_ssh::firewall::iptables
|
||||||
}
|
|
||||||
|
|
||||||
service { $sshd_service:
|
service { $sshd_service:
|
||||||
ensure => running,
|
ensure => running,
|
||||||
|
|||||||
Reference in New Issue
Block a user