Change 'hardened_ssl' paramter to simply 'hardened', this makes more
sense in general
This commit is contained in:
parent
b5e16ec064
commit
fd82841c1f
13 changed files with 18 additions and 14 deletions
|
@ -4,6 +4,10 @@
|
|||
|
||||
This puppet module manages OpenSSH configuration and services.
|
||||
|
||||
**!! Upgrade Notice (05/2015) !!**
|
||||
|
||||
The hardened_ssl parameter name was changed to simply 'hardened'.
|
||||
|
||||
**!! Upgrade Notice (01/2013) !!**
|
||||
|
||||
This module now uses parameterized classes, where it used global variables
|
||||
|
@ -179,8 +183,8 @@ The following is a list of the currently available variables:
|
|||
Set this to the location of the AuthorizedKeysFile
|
||||
(e.g. `/etc/ssh/authorized_keys/%u`). Default: `AuthorizedKeysFile
|
||||
%h/.ssh/authorized_keys`
|
||||
- `hardened_ssl`
|
||||
Use only strong SSL ciphers and MAC.
|
||||
- `hardened`
|
||||
Use only strong ciphers, MAC, KexAlgorithms, etc.
|
||||
Values:
|
||||
- `no` (default)
|
||||
- `yes`
|
||||
|
|
|
@ -40,7 +40,7 @@ class sshd(
|
|||
OpenBSD => '%h/.ssh/authorized_keys',
|
||||
default => '%h/.ssh/authorized_keys %h/.ssh/authorized_keys2',
|
||||
},
|
||||
$hardened_ssl = 'no',
|
||||
$hardened = 'no',
|
||||
$sftp_subsystem = '',
|
||||
$head_additional_options = '',
|
||||
$tail_additional_options = '',
|
||||
|
|
|
@ -150,7 +150,7 @@ AllowUsers <%= s %>
|
|||
AllowGroups <%= s %>
|
||||
<%- end -%>
|
||||
|
||||
<% if scope.lookupvar('sshd::hardened_ssl') == 'yes' -%>
|
||||
<% if scope.lookupvar('sshd::hardened') == 'yes' -%>
|
||||
Ciphers aes256-ctr
|
||||
MACs hmac-sha1
|
||||
<% end -%>
|
||||
|
|
|
@ -164,7 +164,7 @@ AllowGroups <%= s %>
|
|||
#Host *.local
|
||||
# CheckHostIP no
|
||||
|
||||
<% if scope.lookupvar('sshd::hardened_ssl') == 'yes' -%>
|
||||
<% if scope.lookupvar('sshd::hardened') == 'yes' -%>
|
||||
Ciphers aes256-ctr
|
||||
MACs hmac-sha1
|
||||
<% end -%>
|
||||
|
|
|
@ -111,7 +111,7 @@ AllowUsers <%= s %>
|
|||
AllowGroups <%= s %>
|
||||
<%- end -%>
|
||||
|
||||
<% if scope.lookupvar('sshd::hardened_ssl') == 'yes' -%>
|
||||
<% if scope.lookupvar('sshd::hardened') == 'yes' -%>
|
||||
Ciphers aes256-ctr
|
||||
MACs hmac-sha1
|
||||
<% end -%>
|
||||
|
|
|
@ -111,7 +111,7 @@ AllowUsers <%= s %>
|
|||
AllowGroups <%= s %>
|
||||
<%- end -%>
|
||||
|
||||
<% if scope.lookupvar('sshd::hardened_ssl') == 'yes' -%>
|
||||
<% if scope.lookupvar('sshd::hardened') == 'yes' -%>
|
||||
Ciphers aes256-ctr
|
||||
MACs hmac-sha1
|
||||
<% end -%>
|
||||
|
|
|
@ -115,7 +115,7 @@ AllowUsers <%= s %>
|
|||
AllowGroups <%= s %>
|
||||
<%- end -%>
|
||||
|
||||
<% if scope.lookupvar('sshd::hardened_ssl') == 'yes' -%>
|
||||
<% if scope.lookupvar('sshd::hardened') == 'yes' -%>
|
||||
Ciphers aes256-ctr
|
||||
MACs hmac-sha1
|
||||
<% end -%>
|
||||
|
|
|
@ -114,7 +114,7 @@ AllowUsers <%= s %>
|
|||
AllowGroups <%= s %>
|
||||
<%- end -%>
|
||||
|
||||
<% if scope.lookupvar('sshd::hardened_ssl') == 'yes' -%>
|
||||
<% if scope.lookupvar('sshd::hardened') == 'yes' -%>
|
||||
Ciphers aes256-ctr
|
||||
MACs hmac-sha1
|
||||
<% end -%>
|
||||
|
|
|
@ -152,7 +152,7 @@ AllowUsers <%= s %>
|
|||
AllowGroups <%= s %>
|
||||
<%- end -%>
|
||||
|
||||
<% if scope.lookupvar('sshd::hardened_ssl') == 'yes' -%>
|
||||
<% if scope.lookupvar('sshd::hardened') == 'yes' -%>
|
||||
Ciphers aes256-ctr
|
||||
MACs hmac-sha1
|
||||
<% end -%>
|
||||
|
|
|
@ -147,7 +147,7 @@ AllowUsers <%= s %>
|
|||
AllowGroups <%= s %>
|
||||
<%- end -%>
|
||||
|
||||
<% if scope.lookupvar('sshd::hardened_ssl') == 'yes' -%>
|
||||
<% if scope.lookupvar('sshd::hardened') == 'yes' -%>
|
||||
Ciphers aes256-ctr
|
||||
MACs hmac-sha1
|
||||
<% end -%>
|
||||
|
|
|
@ -128,7 +128,7 @@ AllowGroups <%= s %>
|
|||
# AllowTcpForwarding no
|
||||
# ForceCommand cvs server
|
||||
|
||||
<% if scope.lookupvar('sshd::hardened_ssl') == 'yes' -%>
|
||||
<% if scope.lookupvar('sshd::hardened') == 'yes' -%>
|
||||
Ciphers aes256-ctr
|
||||
MACs hmac-sha1
|
||||
<% end -%>
|
||||
|
|
|
@ -115,7 +115,7 @@ AllowUsers <%= s %>
|
|||
AllowGroups <%= s %>
|
||||
<%- end -%>
|
||||
|
||||
<% if scope.lookupvar('sshd::hardened_ssl') == 'yes' -%>
|
||||
<% if scope.lookupvar('sshd::hardened') == 'yes' -%>
|
||||
Ciphers aes256-ctr
|
||||
MACs hmac-sha1
|
||||
<% end -%>
|
||||
|
|
|
@ -118,7 +118,7 @@ AllowGroups <%= s %>
|
|||
|
||||
PrintMotd <%= scope.lookupvar('sshd::print_motd') %>
|
||||
|
||||
<% if scope.lookupvar('sshd::hardened_ssl') == 'yes' -%>
|
||||
<% if scope.lookupvar('sshd::hardened') == 'yes' -%>
|
||||
Ciphers aes256-ctr
|
||||
MACs hmac-sha1
|
||||
<% end -%>
|
||||
|
|
Loading…
Reference in a new issue