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

@@ -340,6 +340,132 @@
         —
         <div class='inline'>
 <p>MaxSessions setting for sshd_config</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ssh_pubkey_auth</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;yes&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>PubkeyAuthentication setting for sshd_config</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ssh_auth_key_files</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;.ssh/authorized_keys&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>AuthorizedKeysFile setting for sshd_config</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ssh_authorized_principals_file</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;none&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>AuthorizedPrincipalsFile setting for sshd_config. Default is ‘none’ to disable this setting.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ssh_authorized_keys_command</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;none&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>AuthorizedKeysCommand setting for sshd_config. Default is ‘none’ to disable this setting.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ssh_authorized_keys_command_user</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;nobody&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>AuthorizedKeysCommandUser setting for sshd_config. Default is ‘nobody’ to use an unpriviledged user.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ssh_use_specific_hostkey</span>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>false</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>whether to use a specific host key</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ssh_hostkey_type</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;rsa&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>type of host key to use if ssh_use_specific_hostkey is true</p>
 </div>
       
     </li>
@@ -355,17 +481,6 @@
         <pre class="lines">
 
 
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
 31
 32
 33
@@ -395,10 +510,28 @@
 57
 58
 59
-60</pre>
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 20</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 31</span>
 
 class confdroid_ssh::params (
 
@@ -411,7 +544,7 @@ class confdroid_ssh::params (
   String $ssh_fw_order                      = &#39;50&#39;,
   String $ssh_source_range                  = &#39;0.0.0.0/0&#39;,
 
-  # main configuration 
+  # sshd configuration 
   Boolean $ssh_manage_config                = true,
   String  $ssh_address_family               = &#39;any&#39;,
   String  $ssh_listen_address               = &#39;0.0.0.0&#39;,
@@ -419,6 +552,13 @@ class confdroid_ssh::params (
   String  $ssh_strict_modes                 = &#39;yes&#39;,
   String  $ssh_max_auth_tries               = &#39;6&#39;,
   String  $ssh_max_sessions                 = &#39;10&#39;,
+  String  $ssh_pubkey_auth                  = &#39;yes&#39;,
+  String  $ssh_auth_key_files               = &#39;.ssh/authorized_keys&#39;,
+  String  $ssh_authorized_principals_file   = &#39;none&#39;,
+  String  $ssh_authorized_keys_command      = &#39;none&#39;,
+  String  $ssh_authorized_keys_command_user = &#39;nobody&#39;,
+  Boolean $ssh_use_specific_hostkey         = false,
+  String  $ssh_hostkey_type                 = &#39;rsa&#39;,
 
 ) {
 # default facts

manifests/params.pp

@@ -16,6 +16,17 @@
 # @param [String] ssh_strict_modes StrictModes setting for sshd_config
 # @param [String] ssh_max_auth_tries MaxAuthTries setting for sshd_config
 # @param [String] ssh_max_sessions MaxSessions setting for sshd_config
+# @param [String] ssh_pubkey_auth PubkeyAuthentication setting for sshd_config
+# @param [String] ssh_auth_key_files AuthorizedKeysFile setting for sshd_config
+# @param [String] ssh_authorized_principals_file AuthorizedPrincipalsFile 
+#   setting for sshd_config. Default is 'none' to disable this setting.
+# @param [String] ssh_authorized_keys_command AuthorizedKeysCommand setting for sshd_config. 
+#   Default is 'none' to disable this setting.
+# @param [String] ssh_authorized_keys_command_user AuthorizedKeysCommandUser setting for sshd_config.
+#   Default is 'nobody' to use an unpriviledged user.
+# @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
 ##############################################################################
 class confdroid_ssh::params (
 
@@ -28,7 +39,7 @@ class confdroid_ssh::params (
   String $ssh_fw_order                      = '50',
   String $ssh_source_range                  = '0.0.0.0/0',
 
-  # main configuration 
+  # sshd configuration 
   Boolean $ssh_manage_config                = true,
   String  $ssh_address_family               = 'any',
   String  $ssh_listen_address               = '0.0.0.0',
@@ -36,6 +47,13 @@ class confdroid_ssh::params (
   String  $ssh_strict_modes                 = 'yes',
   String  $ssh_max_auth_tries               = '6',
   String  $ssh_max_sessions                 = '10',
+  String  $ssh_pubkey_auth                  = 'yes',
+  String  $ssh_auth_key_files               = '.ssh/authorized_keys',
+  String  $ssh_authorized_principals_file   = 'none',
+  String  $ssh_authorized_keys_command      = 'none',
+  String  $ssh_authorized_keys_command_user = 'nobody',
+  Boolean $ssh_use_specific_hostkey         = false,
+  String  $ssh_hostkey_type                 = 'rsa',
 
 ) {
 # default facts

templates/sshd_custom_conf.erb

@@ -13,3 +13,14 @@ 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 %>
+
+AuthorizedPrincipalsFile <%= @ssh_authorized_principals_file %>
+AuthorizedKeysCommand <%= @ssh_authorized_keys_command %>
+AuthorizedKeysCommandUser <%= @ssh_authorized_keys_command_user %>
+
+<% if @ssh_use_specific_hostkey -%>
+HostKey /etc/ssh/ssh_host_<%= @ssh_hostkey_type %>_key
+<% end -%>