puppet/ssh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Align fixtures with 20.04 defaults

Browse Source
This commit is contained in:
mergwyn 2020-07-06 21:08:32 +01:00
parent f2b6c2d8a8
commit 0a54ab8801
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/init.pp
View File

@ -110,7 +110,11 @@ class ssh (
$ssh_config_global_known_hosts_group = 'root',
$ssh_config_global_known_hosts_mode = '0644',
$ssh_config_user_known_hosts_file = undef,
<<<<<<< HEAD
$ssh_config_include = 'USE_DEFAULTS',
=======
Optional[Ssh::Include] $ssh_config_include = 'USE_DEFAULTS',
>>>>>>> 7aa838a... Align fixtures with defaults
$config_entries = {},
$keys = undef,
$manage_root_ssh_config = false,
@ -123,7 +127,11 @@ class ssh (
$sshd_config_key_revocation_list = undef,
$sshd_config_authorized_principals_file = undef,
$sshd_config_allowagentforwarding = undef,
<<<<<<< HEAD
$sshd_config_include = 'USE_DEFAULTS',
=======
Optional[Ssh::Include] $sshd_config_include = 'USE_DEFAULTS',
>>>>>>> 7aa838a... Align fixtures with defaults
) {
case $::osfamily {
@ -291,6 +299,12 @@ class ssh (
$default_sshd_use_pam = 'yes'
$default_sshd_x11_forwarding = 'yes'
$default_sshd_config_include = '/etc/ssh/sshd_config.d/*.conf'
$default_sshd_gssapicleanupcredentials = 'yes'
$default_sshd_acceptenv = true
$default_service_hasstatus = true
$default_sshd_config_serverkeybits = '1024'
$default_sshd_addressfamily = 'any'
$default_sshd_config_tcp_keepalive = 'yes'
}
/^10.*/: {
$default_sshd_config_hostkey = [

5
types/include.pp Normal file
View File

@ -0,0 +1,5 @@
# config files to be includes
# @summary
# directory of array of directories to be included
#
type Ssh::Include = Variant[String[1],Array[String[1]]]