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

Auto-merge for build 11

See merge request puppet/confdroid_ssh!11

doc/puppet_classes/confdroid_ssh_3A_3Amain_3A_3Aservice.html

@@ -113,7 +113,9 @@
 15
 16
 17
-18</pre>
+18
+19
+20</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span>
@@ -122,7 +124,9 @@ class confdroid_ssh::main::service (
 ) inherits confdroid_ssh::params {
   require confdroid_ssh::main::files
   require confdroid_ssh::selinux::semanage
-  require confdroid_ssh::firewall::iptables
+  if $ssh_use_firewall {
+    require confdroid_ssh::firewall::iptables
+  }
 
   service { $sshd_service:
     ensure     =&gt; running,

manifests/main/service.pp

@@ -7,7 +7,9 @@ class confdroid_ssh::main::service (
 ) inherits confdroid_ssh::params {
   require confdroid_ssh::main::files
   require confdroid_ssh::selinux::semanage
-  require confdroid_ssh::firewall::iptables
+  if $ssh_use_firewall {
+    require confdroid_ssh::firewall::iptables
+  }
 
   service { $sshd_service:
     ensure     => running,