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

Auto-merge for build 16

See merge request puppet/confdroid_ssh!16

doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html

@@ -120,7 +120,7 @@ class confdroid_ssh::firewall::iptables (
 
 ) inherits confdroid_ssh::params {
   firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}":
-    ensure => $ssh_use_firewall,
+    ensure => $ssh_fw_rule,
     proto  => 'tcp',
     source => $ssh_source_range,
     dport  => $ssh_fw_port,

doc/puppet_classes/confdroid_ssh_3A_3Aparams.html

@@ -148,7 +148,7 @@
   
     <li>
       
-        <span class='name'>ssh_use_firewall</span>
+        <span class='name'>ssh_fw_rule</span>
       
       
         <span class='type'>(<tt>String</tt>)</span>
@@ -406,7 +406,7 @@ class confdroid_ssh::params (
   String $pkg_ensure          = &#39;present&#39;,
 
   # firewall settings
-  String $ssh_use_firewall   = &#39;present&#39;,
+  String $ssh_fw_rule         = &#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;,

manifests/firewall/iptables.pp

@@ -7,7 +7,7 @@ class confdroid_ssh::firewall::iptables (
 
 ) inherits confdroid_ssh::params {
   firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}":
-    ensure => $ssh_use_firewall,
+    ensure => $ssh_fw_rule,
     proto  => 'tcp',
     source => $ssh_source_range,
     dport  => $ssh_fw_port,

manifests/params.pp

@@ -4,7 +4,7 @@
 # @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 [String] ssh_use_firewall whether set the fw rule to 
+# @param [String] ssh_fw_rule 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
@@ -23,7 +23,7 @@ class confdroid_ssh::params (
   String $pkg_ensure          = 'present',
 
   # firewall settings
-  String $ssh_use_firewall   = 'present',
+  String $ssh_fw_rule         = 'present',
   String $ssh_fw_port         = '22',
   String $ssh_fw_order        = '50',
   String $ssh_source_range    = '0.0.0.0/0',