20 files changed, 62 insertions, 41 deletions
diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys
index d88db10..9198118 100644
--- a/.ssh/authorized_keys
+++ b/.ssh/authorized_keys
@@ -3,17 +3,27 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEeckhvozWNKJssM+PY44fBXkzVeoqg9H8NHreWLUvGY
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7lMmT3CJEPk1BnpW0UHie6g0LUJ/i45Sp5l4DGocwg root@denahnu.tyil.net
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID2tje8i3DtCmLrc+qJ7d02qQQ0lO7wtwWXO4XthWGra root@edephas.tyil.net
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICcFE9oQT3s+vLsv4WNKTn3K0ZhntStXdCHfdBPj/62V root@faiwoo.tyil.net
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICj0hW49y+AGuMN2D672I5K6ZVLPVZLCsd+2MIat54nP root@gaeru.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILmqoy/OXsmmNpxEN/xISbHwDFt2u8f3HmGIvS2CASHm root@gaeru.tyil.net
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOdRI1JSQnDYqoCkCrNz/T9mLSCNb5vRSnNjb/3CGtDK root@hurzak.tyil.net
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC331lDhnHuQl4vkTUU5riqJ72ShdZN6zWdt1E3UJ/CJ root@krohxe.tyil.net
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC2UxgdieMtF0a9QXFRb5QVYOwxG9oN1Q85///Y6VCZj root@tyil.email
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOLpn3Tny1LSWaLeIDmdAkZZoAajSJN9CQvfFdgLFfsK tyil@anoia.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJLcXzcOPEYQWEARFgPpZCq2NZhTBWTsIezd4Mrkt0PY root@mieshu.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIh9xYBxb5n2N20Dj03lsij32UkPJ27EMQ/6VdKhjWVJ root@nouki.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII6oh68n5HXeK45YaNnQC0mHufB/bUgsEyE500OW40B1 root@oolah.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBnTRndwR171+hR+3yMpvmbRZoM8QFUE2zdOQZaqd24E root@plarabe.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE7T/5E/oA5ZO1VcIfaQGTvHcKn1dCh5APRLZH4CTNXf root@qohrei.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMtUkeSiwk+1UnMfy8Z53cQkKTlBBFZXUuDiXfPcalHj tyil@anoia.tyil.net
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILQp0puZEEADKgUF1XYtLPzcYLTGNdDj0WCTf37adaZ2 tyil@caeghi.tyil.net
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE4sustL8Mw5lQpyuUnmhJgeypvlHy6UFaEKmFCGcltL tyil@denahnu.tyil.net
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHiNIpe2QCOk22YYU/mY7QA2rq0E07wetzj5R1wtWxeC tyil@edephas.tyil.net
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCiQJhuTvL0vZoOAu1L0sU81VV2qH1l4U73bL9RYfrW tyil@faiwoo.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ94ffGPvEb/Hi2B2XSaYjKpMiV93fzGLe0QUlXRJb1L tyil@gaeru.tyil.net
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINRprF4gE0pGiMNSxR8Z0fFsBikoifsm7HpdbHkBsmDg tyil@hurzak.tyil.net
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE+Ki28DBM3A8QUpxbAlZx2x111+rhn8JPcec67y9xi/ tyil@ivdea.tyil.net
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQDyWbo8Ma60t5wwKK2bdxo03gj2GxxCyn2/V2nNr5Z tyil@tyil.email
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIVPGs2LkDvdkMzwR1Crk8OblMQD2snClUuIcYgUYcu4 tyil@ludifah.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFqLhjoIYRZmkD9sv1l1c03x6EpkadjfrGJ+4gqgkmp5 tyil@mieshu.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNztf75LVF+UvoIDyduHfynZupdC+9g7RaIs6cGgmCa tyil@nouki.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJkjrJ6agLK5Bdg2Y5B+88XDbP5UsQyvdUbd3LrOVmjI tyil@oolah.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ7XKD3KxXTe5GlM4w4xdap3VAPvYCi4EowD88ymInFR tyil@plarabe.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPyOy5m6FnzyUBHplh8Eukz6rqvMW/mUh1cqUQrO3L/R tyil@qohrei.tyil.net
 
-AAAAB3NzaC1yc2EAAAADAQABAAABAQDLRsHpUMeMrXr1s++ZJ7AQ5bLzBAHOQXkTd34Bin72aRD/iLVrEnxrE7Bk5UzWhvcedHHltpc8sdy0m8UFozprFeogD+1EpfdelycmfEBgzJE+p0+W/qsSMGy9AMgar7cNo8G4/eJr63XjyAdXG7eztmoz5Whgv0qlh2lW2dJ2orrlPF0bUA8tAx0ZAtJqvVEJZlXIlYqHCbYLHrif7w52UWV7UlkOosCl4FDsTO7BGkpRj6A/tGhu7gtTX1P9NQav2KFPvFko+S6jlEwCE1StwbiRop90grdv6OZ5UJe6KE2MEntwoW01y7BnB+lvgMTQyqKLKS1ffEbXIQPhbjBL yubikey (7 835 697)
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC2UxgdieMtF0a9QXFRb5QVYOwxG9oN1Q85///Y6VCZj root@tyil.email
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQDyWbo8Ma60t5wwKK2bdxo03gj2GxxCyn2/V2nNr5Z tyil@tyil.email
diff --git a/.ssh/config b/.ssh/config
index 4fdbae5..c0a670d 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,19 +1,22 @@
-IdentityFile ~/.ssh/id.d/%u@%L-ed25519
 UserKnownHostsFile ~/.ssh/known_hosts
 Include config.d/*
 
+Host *
+	IdentityFile ~/.ssh/id.d/%u@%L-ed25519
+
 Host home.tyil.nl
-	Hostname 10.57.100.7
+	Hostname 10.57.0.1
 	ForwardAgent yes
 
 Host git.tyil.nl
-	Hostname 10.57.100.7
+	Hostname 10.57.3.1
 	User git
 
 Host rsync.net
 	User zh1193
 	Hostname zh1193.rsync.net
 
+# Test cluster
 # Libvirt VMs
 Host 192.168.122.*
 	User root
diff --git a/.ssh/config.d/tyilnet b/.ssh/config.d/tyilnet
index 9694dc0..4bad39d 100644
--- a/.ssh/config.d/tyilnet
+++ b/.ssh/config.d/tyilnet
@@ -1,36 +1,39 @@
 Host anoia
-	Hostname 10.57.100.3
-
-Host bast
-	Hostname 10.57.100.4
+	Hostname fd68:1057:1992:3381::0:3317:4
 
 Host caeghi
-	Hostname 10.57.20.2
+	Hostname fd68:1057:1992:3381::1:1:1
 	ForwardAgent yes
 
-Host denahnu
-	Hostname 10.57.20.4
-
 Host edephas
-	Hostname 10.57.100.7
-
-Host email
-	Hostname 10.57.20.3
+	Hostname fd68:1057:1992:3381::0:3317:1
 
 Host faiwoo
-	Hostname 10.57.20.5
+	Hostname fd68:1057:1992:3381::1:1:2
 
 Host gaeru
-	Hostname 10.57.20.6
+	Hostname fd68:1057:1992:3381::1:2:1
 
-Host hurzak
-	Hostname 10.57.20.7
+Host jaomox
+	Hostname fd68:1057:1992:3381::3:3:1
 
-Host ivdea
-	Hostname 10.57.100.8
+Host ludifah
+	Hostname fd68:1057:1992:3381::0:3317:2
 
-Host jaomox
-	Hostname 10.57.21.1
+Host mieshu
+	Hostname fd68:1057:1992:3381::3:3317:1
+
+Host nouki
+	Hostname fd68:1057:1992:3381::2:3317:1
+
+Host oolah
+	Hostname fd68:1057:1992:3381::1:3317:1
+
+Host plarabe
+	Hostname fd68:1057:1992:3381::0:3317:3
+
+Host qohrei
+	Hostname fd68:1057:1992:3381::1:1:3
 
-Host krohxe
-	Hostname 10.57.20.8
+Host ricui
+	Hostname fd68:1057:1992:3381::1:1:4
diff --git a/.ssh/config.d/xxllnc b/.ssh/config.d/xxllnc
index 12739e9..47643e6 100644
--- a/.ssh/config.d/xxllnc
+++ b/.ssh/config.d/xxllnc
@@ -3,9 +3,8 @@ Host *.zsys.nl
 	StrictHostKeyChecking no
 	UserKnownHostsFile /dev/null
 
-Host git.xxllnc.nl
+Host git.xxllnc.nl gitlab.com
 	Hostname gitlab.com
 	User git
-	IdentityFile ~/.ssh/id.d/xxllnc@%L-ed25519
 
 # vim: set ft=sshconfig :
diff --git a/.ssh/id.d/root@bast-ed25519.pub b/.ssh/id.d/root@bast-ed25519.pub
deleted file mode 100644
index e1d7ab3..0000000
--- a/.ssh/id.d/root@bast-ed25519.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICk/6jLojpp5Jaum8C1trxqtZuLd/GJH8sh0SB/Z/y9J root@bast
diff --git a/.ssh/id.d/root@gaeru-ed25519.pub b/.ssh/id.d/root@gaeru-ed25519.pub
index 3056a3d..fe3c6a7 100644
--- a/.ssh/id.d/root@gaeru-ed25519.pub
+++ b/.ssh/id.d/root@gaeru-ed25519.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICj0hW49y+AGuMN2D672I5K6ZVLPVZLCsd+2MIat54nP root@gaeru.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILmqoy/OXsmmNpxEN/xISbHwDFt2u8f3HmGIvS2CASHm root@gaeru.tyil.net
diff --git a/.ssh/id.d/root@mieshu-ed25519.pub b/.ssh/id.d/root@mieshu-ed25519.pub
new file mode 100644
index 0000000..0faf439
--- /dev/null
+++ b/.ssh/id.d/root@mieshu-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJLcXzcOPEYQWEARFgPpZCq2NZhTBWTsIezd4Mrkt0PY root@mieshu.tyil.net
diff --git a/.ssh/id.d/root@nouki-ed25519.pub b/.ssh/id.d/root@nouki-ed25519.pub
new file mode 100644
index 0000000..a19b34e
--- /dev/null
+++ b/.ssh/id.d/root@nouki-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIh9xYBxb5n2N20Dj03lsij32UkPJ27EMQ/6VdKhjWVJ root@nouki.tyil.net
diff --git a/.ssh/id.d/root@oolah-ed25519.pub b/.ssh/id.d/root@oolah-ed25519.pub
new file mode 100644
index 0000000..d4c3c0d
--- /dev/null
+++ b/.ssh/id.d/root@oolah-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII6oh68n5HXeK45YaNnQC0mHufB/bUgsEyE500OW40B1 root@oolah.tyil.net
diff --git a/.ssh/id.d/root@plarabe-ed25519.pub b/.ssh/id.d/root@plarabe-ed25519.pub
new file mode 100644
index 0000000..01cdb82
--- /dev/null
+++ b/.ssh/id.d/root@plarabe-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMC9ggRv1prBjbIeqh+Q2VgX6tcxk/4UiQh4sZWJT9YI root@plarabe
diff --git a/.ssh/id.d/tyil@anoia-ed25519.pub b/.ssh/id.d/tyil@anoia-ed25519.pub
index aea0daa..f1b7158 100644
--- a/.ssh/id.d/tyil@anoia-ed25519.pub
+++ b/.ssh/id.d/tyil@anoia-ed25519.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOLpn3Tny1LSWaLeIDmdAkZZoAajSJN9CQvfFdgLFfsK tyil@anoia.tyil.net
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMtUkeSiwk+1UnMfy8Z53cQkKTlBBFZXUuDiXfPcalHj tyil@anoia
diff --git a/.ssh/id.d/tyil@bast-ed25519.pub b/.ssh/id.d/tyil@bast-ed25519.pub
deleted file mode 100644
index 00e492d..0000000
--- a/.ssh/id.d/tyil@bast-ed25519.pub
+++ /dev/null
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXhPa+EGS4NySl0YqG38xGEab6uqdimseqq4tlLWyV4 tyil@bast.tyil.net
-=======
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILE1+6HjG3XvLQDHLwnFzq78SEsPTNa8Wu6+inmTMqu7 tyil@bast
->>>>>>> d8b0063 (Update pubkey for tyil@bast)
diff --git a/.ssh/id.d/tyil@gaeru-ed25519.pub b/.ssh/id.d/tyil@gaeru-ed25519.pub
new file mode 100644
index 0000000..d5632d9
--- /dev/null
+++ b/.ssh/id.d/tyil@gaeru-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ94ffGPvEb/Hi2B2XSaYjKpMiV93fzGLe0QUlXRJb1L tyil@gaeru.tyil.net
diff --git a/.ssh/id.d/tyil@ludifah-ed25519.pub b/.ssh/id.d/tyil@ludifah-ed25519.pub
new file mode 100644
index 0000000..e3503e7
--- /dev/null
+++ b/.ssh/id.d/tyil@ludifah-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIVPGs2LkDvdkMzwR1Crk8OblMQD2snClUuIcYgUYcu4 tyil@ludifah.tyil.net
diff --git a/.ssh/id.d/tyil@mieshu-ed25519.pub b/.ssh/id.d/tyil@mieshu-ed25519.pub
new file mode 100644
index 0000000..a70b37c
--- /dev/null
+++ b/.ssh/id.d/tyil@mieshu-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFqLhjoIYRZmkD9sv1l1c03x6EpkadjfrGJ+4gqgkmp5 tyil@mieshu.tyil.net
diff --git a/.ssh/id.d/tyil@nouki-ed25519.pub b/.ssh/id.d/tyil@nouki-ed25519.pub
new file mode 100644
index 0000000..52f292a
--- /dev/null
+++ b/.ssh/id.d/tyil@nouki-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNztf75LVF+UvoIDyduHfynZupdC+9g7RaIs6cGgmCa tyil@nouki.tyil.net
diff --git a/.ssh/id.d/tyil@oolah-ed25519.pub b/.ssh/id.d/tyil@oolah-ed25519.pub
new file mode 100644
index 0000000..dabadac
--- /dev/null
+++ b/.ssh/id.d/tyil@oolah-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJkjrJ6agLK5Bdg2Y5B+88XDbP5UsQyvdUbd3LrOVmjI tyil@oolah.tyil.net
diff --git a/.ssh/id.d/tyil@plarabe-ed25519.pub b/.ssh/id.d/tyil@plarabe-ed25519.pub
new file mode 100644
index 0000000..25a5449
--- /dev/null
+++ b/.ssh/id.d/tyil@plarabe-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ7XKD3KxXTe5GlM4w4xdap3VAPvYCi4EowD88ymInFR tyil@plarabe
diff --git a/.ssh/id.d/xxllnc@edephas-ed25519.pub b/.ssh/id.d/xxllnc@edephas-ed25519.pub
new file mode 100644
index 0000000..b2d20a8
--- /dev/null
+++ b/.ssh/id.d/xxllnc@edephas-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvrXVgXTxw/Y684WFfrpIveRoTmdCNZ7Da3g4ZNhwjT tyil@edephas
diff --git a/.ssh/id.d/xxllnc@ivdea-ed25519.pub b/.ssh/id.d/xxllnc@ivdea-ed25519.pub
new file mode 100644
index 0000000..fa7994d
--- /dev/null
+++ b/.ssh/id.d/xxllnc@ivdea-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHANHdBJh/dMbYhKCbHMtYo9F+OwyL7BaGb6JHDNYn9V tyil@ivdea