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

Fix merge conflict

Browse Source
This commit is contained in:
mergwyn 2020-07-07 09:18:49 +01:00
parent 16902eb37f
commit 81ec143d9c
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/init.pp
View File

@ -110,15 +110,7 @@ class ssh (
$ssh_config_global_known_hosts_group = 'root', $ssh_config_global_known_hosts_group = 'root',
$ssh_config_global_known_hosts_mode = '0644', $ssh_config_global_known_hosts_mode = '0644',
$ssh_config_user_known_hosts_file = undef, $ssh_config_user_known_hosts_file = undef,
<<<<<<< HEAD
<<<<<<< HEAD
$ssh_config_include = 'USE_DEFAULTS', $ssh_config_include = 'USE_DEFAULTS',
=======
Optional[Ssh::Include] $ssh_config_include = 'USE_DEFAULTS',
>>>>>>> 7aa838a... Align fixtures with defaults
=======
$ssh_config_include = 'USE_DEFAULTS',
>>>>>>> bedb2727907d794c61ebfaaf552890096db3381b
$config_entries = {}, $config_entries = {},
$keys = undef, $keys = undef,
$manage_root_ssh_config = false, $manage_root_ssh_config = false,
@ -131,15 +123,7 @@ class ssh (
$sshd_config_key_revocation_list = undef, $sshd_config_key_revocation_list = undef,
$sshd_config_authorized_principals_file = undef, $sshd_config_authorized_principals_file = undef,
$sshd_config_allowagentforwarding = undef, $sshd_config_allowagentforwarding = undef,
<<<<<<< HEAD
<<<<<<< HEAD
$sshd_config_include = 'USE_DEFAULTS', $sshd_config_include = 'USE_DEFAULTS',
=======
Optional[Ssh::Include] $sshd_config_include = 'USE_DEFAULTS',
>>>>>>> 7aa838a... Align fixtures with defaults
=======
$sshd_config_include = 'USE_DEFAULTS',
>>>>>>> bedb2727907d794c61ebfaaf552890096db3381b
) { ) {
case $::osfamily { case $::osfamily {