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

Auto-merge for build 17

See merge request puppet/confdroid_ssh!17

doc/puppet_classes/confdroid_ssh_3A_3Aparams.html

@@ -466,60 +466,6 @@
         —
         <div class='inline'>
 <p>type of host key to use if ssh_use_specific_hostkey is true</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ssh_rekeylimit</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;default none&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>RekeyLimit setting for sshd_config. Default is ‘default none’.</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ssh_syslog_facility</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;AUTH&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>SyslogFacility setting for sshd_config. Default is ‘AUTH’.</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ssh_log_level</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;INFO&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>LogLevel setting for sshd_config. Default is ‘INFO’.</p>
 </div>
       
     </li>
@@ -535,6 +481,12 @@
         <pre class="lines">
 
 
+31
+32
+33
+34
+35
+36
 37
 38
 39
@@ -576,19 +528,10 @@
 75
 76
 77
-78
+78</pre>
-79
-80
-81
-82
-83
-84
-85
-86
-87</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 37</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 31</span>
 
 class confdroid_ssh::params (
 
@@ -616,9 +559,6 @@ class confdroid_ssh::params (
   String  $ssh_authorized_keys_command_user = &#39;nobody&#39;,
   Boolean $ssh_use_specific_hostkey         = false,
   String  $ssh_hostkey_type                 = &#39;rsa&#39;,
-  String  $ssh_rekeylimit                   = &#39;default none&#39;,
-  String  $ssh_syslog_facility              = &#39;AUTH&#39;,
-  String  $ssh_log_level                    = &#39;INFO&#39;
 
 ) {
 # default facts

manifests/params.pp

@@ -27,12 +27,6 @@
 # @param [Boolean] ssh_use_specific_hostkey whether to use a specific host key
 # @param [String] ssh_hostkey_type type of host key to use if 
 #   ssh_use_specific_hostkey is true
-# @param [String] ssh_rekeylimit RekeyLimit setting for sshd_config. 
-#   Default is 'default none'.
-# @param [String] ssh_syslog_facility SyslogFacility setting for sshd_config.
-#   Default is 'AUTH'.
-# @param [String] ssh_log_level LogLevel setting for sshd_config.
-#   Default is 'INFO'.
 ##############################################################################
 class confdroid_ssh::params (
 
@@ -60,9 +54,6 @@ class confdroid_ssh::params (
   String  $ssh_authorized_keys_command_user = 'nobody',
   Boolean $ssh_use_specific_hostkey         = false,
   String  $ssh_hostkey_type                 = 'rsa',
-  String  $ssh_rekeylimit                   = 'default none',
-  String  $ssh_syslog_facility              = 'AUTH',
-  String  $ssh_log_level                    = 'INFO'
 
 ) {
 # default facts

templates/sshd_custom_conf.erb

@@ -9,6 +9,11 @@ Port <%= @ssh_fw_port %>
 AddressFamily <%= @ssh_address_family %>
 ListenAddress <%= @ssh_listen_address %> 
 
+PermitRootLogin <%= @ssh_root_login %>
+StrictModes <%= @ssh_strict_modes %>
+MaxAuthTries <%= @ssh_max_auth_tries %>
+MaxSessions <%= @ssh_max_sessions %>
+
 PubkeyAuthentication <%= @ssh_pubkey_auth %>
 AuthorizedKeysFile	<%= @ssh_auth_key_files %>
 
@@ -18,14 +23,4 @@ AuthorizedKeysCommandUser <%= @ssh_authorized_keys_command_user %>
 
 <% if @ssh_use_specific_hostkey -%>
 HostKey /etc/ssh/ssh_host_<%= @ssh_hostkey_type %>_key
-<% end -%>
+<% end -%>
-
-RekeyLimit <%= @ssh_rekeylimit %>
-
-SyslogFacility <%= @ssh_syslog_facility %>
-LogLevel <%= @ssh_log_level %>
-
-PermitRootLogin <%= @ssh_root_login %>
-StrictModes <%= @ssh_strict_modes %>
-MaxAuthTries <%= @ssh_max_auth_tries %>
-MaxSessions <%= @ssh_max_sessions %>