From 42cbb44595ce00d86cc426d5f7261c03068d12fd Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 17 Dec 2020 01:02:53 +0100 Subject: [PATCH 1/3] . --- roles/sshd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sshd b/roles/sshd index 4d499b9..8d5e1f3 160000 --- a/roles/sshd +++ b/roles/sshd @@ -1 +1 @@ -Subproject commit 4d499b97d6cbd2a01ac27f15b128c28da3aa4ac9 +Subproject commit 8d5e1f32ba5930e9a12d01688a9af8c5e55395c0 From 9af0fc5f653317dd099b44346d18e5df008e2ee6 Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 14 Jan 2021 21:33:33 +0100 Subject: [PATCH 2/3] Update --- group_vars/thinkpad.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/group_vars/thinkpad.yml b/group_vars/thinkpad.yml index bea19aa..91d082a 100644 --- a/group_vars/thinkpad.yml +++ b/group_vars/thinkpad.yml @@ -40,10 +40,4 @@ print_os_vars: true install_pass_as_password_manager: true extra_bashrc: "alias dd='dd bs=4M status=progress oflag=dsync'" temporarily_disable_screensaver: false -<<<<<<< HEAD - -sshd__key_types: - - 'ed25519' - - 'rsa' - - 'ecdsa' modify_lightdm: false From bdab9b9b20c9cf67c93624c1d9a68c5616f544e6 Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 14 Jan 2021 21:38:16 +0100 Subject: [PATCH 3/3] Update gitmodules --- roles/ansible_version | 2 +- roles/dotfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/ansible_version b/roles/ansible_version index b76c32e..ec79561 160000 --- a/roles/ansible_version +++ b/roles/ansible_version @@ -1 +1 @@ -Subproject commit b76c32e001b9a66de2c9ebee74d466286e21b27b +Subproject commit ec79561b0f88c8f4f3771a7f330665e7b2e913b7 diff --git a/roles/dotfiles b/roles/dotfiles index 05ff3ae..1d17b45 160000 --- a/roles/dotfiles +++ b/roles/dotfiles @@ -1 +1 @@ -Subproject commit 05ff3aec131a7da250538d340199f8f9248725ac +Subproject commit 1d17b45e953e7cbdcfa73732dd0185d6a5925a2c