aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-12-25 23:47:52 +0100
committerAlex Auvolat <alex@adnab.me>2022-12-25 23:47:52 +0100
commit0becfc25717f659945a104d26209f63e573c4789 (patch)
tree19578cf528d037722c59f368ccfd0e6d9887742b
parent40f56707535a7167c1ea1e4bafb0868dfaba8117 (diff)
parentb63c03f6355aacd436058c0fd9f2bdb622b85f93 (diff)
downloadnixcfg-0becfc25717f659945a104d26209f63e573c4789.tar.gz
nixcfg-0becfc25717f659945a104d26209f63e573c4789.zip
Merge branch 'main' into new-secretmgr
-rw-r--r--cluster/prod/known_hosts9
-rw-r--r--cluster/prod/ssh_config11
-rw-r--r--cluster/staging/known_hosts4
-rw-r--r--cluster/staging/ssh_config17
-rw-r--r--ssh_known_hosts27
5 files changed, 22 insertions, 46 deletions
diff --git a/cluster/prod/known_hosts b/cluster/prod/known_hosts
new file mode 100644
index 0000000..af32b6b
--- /dev/null
+++ b/cluster/prod/known_hosts
@@ -0,0 +1,9 @@
+doradille.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKzVJB1XYBC/rMxb7UfAoCzKH/l6oE4NKsSErCv2wV94
+dahlia.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIQsdIYUn4njMRAuT0/8GzqGn6zGn9014BAkT7VSVf2H
+diplotaxis.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFcVtfOj0ti6eYsFSq2gbBGhaf8E7p/QiO3/MVX1D32T
+df-ykl.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEwsKl1Bv8HJa+rO2KymEDhKEcDY3s9CQmDQ8i/tHf4E
+df-ymk.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIo6bcVtpZ+pRVs0vNaUgC0kY5ddPtWryUmFQTZjA+73
+df-ymf.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2el374ejNXqF+yyMxOOhY2DWSJB9tbjr2H7gFfQtbc
+celeri.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
+concombre.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
+courgette.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G
diff --git a/cluster/prod/ssh_config b/cluster/prod/ssh_config
index d1e4a13..11dcc15 100644
--- a/cluster/prod/ssh_config
+++ b/cluster/prod/ssh_config
@@ -1,16 +1,13 @@
-UserKnownHostsFile ./ssh_known_hosts
+UserKnownHostsFile ./cluster/prod/known_hosts
Host concombre
- HostName 2001:910:1204:1::31
- #HostName 192.168.1.31
+ HostName concombre.machine.deuxfleurs.fr
Host courgette
- HostName 2001:910:1204:1::32
- #HostName 192.168.1.32
+ HostName courgette.machine.deuxfleurs.fr
Host celeri
- HostName 2001:910:1204:1::33
- #HostName 192.168.1.33
+ HostName celeri.machine.deuxfleurs.fr
Host dahlia
HostName dahlia.machine.deuxfleurs.fr
diff --git a/cluster/staging/known_hosts b/cluster/staging/known_hosts
new file mode 100644
index 0000000..68f25c0
--- /dev/null
+++ b/cluster/staging/known_hosts
@@ -0,0 +1,4 @@
+carcajou.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ
+cariacou.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXTUrXRFhudJBESCqjHCOttzqYPyIzpPOMkI8+SwLRx
+caribou.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPtsVFIoIu6tnYrzlcCbBiQXxNkFSWVMhMznUuSxGZ22
+origan.df.trinity.fr.eu.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsZas74RT6lCZwuUOPR23nPdbSdpWORyAmRgjoiMVHK
diff --git a/cluster/staging/ssh_config b/cluster/staging/ssh_config
index 407d39b..e1eecc3 100644
--- a/cluster/staging/ssh_config
+++ b/cluster/staging/ssh_config
@@ -1,20 +1,13 @@
-UserKnownHostsFile ./ssh_known_hosts
+UserKnownHostsFile ./cluster/staging/known_hosts
Host caribou
- #HostName 2001:910:1204:1::23
- HostName 192.168.1.23
+ HostName caribou.machine.deuxfleurs.fr
Host carcajou
- #HostName 2001:910:1204:1::22
- HostName 192.168.1.22
+ HostName carcajou.machine.deuxfleurs.fr
Host cariacou
- #HostName 2001:910:1204:1::21
- HostName 192.168.1.21
-
-Host spoutnik
- HostName 10.42.0.2
- Port 220
+ HostName cariacou.machine.deuxfleurs.fr
Host origan
- HostName 2a01:e0a:5e4:1d0:223:24ff:feaf:fdec
+ HostName origan.df.trinity.fr.eu.org
diff --git a/ssh_known_hosts b/ssh_known_hosts
deleted file mode 100644
index 530df33..0000000
--- a/ssh_known_hosts
+++ /dev/null
@@ -1,27 +0,0 @@
-192.168.1.22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ
-192.168.1.21 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXTUrXRFhudJBESCqjHCOttzqYPyIzpPOMkI8+SwLRx
-192.168.1.31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
-192.168.1.32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G
-192.168.1.33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
-2a06:a004:3024::21 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXTUrXRFhudJBESCqjHCOttzqYPyIzpPOMkI8+SwLRx
-2a06:a004:3024::22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ
-doradille.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKzVJB1XYBC/rMxb7UfAoCzKH/l6oE4NKsSErCv2wV94
-dahlia.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIQsdIYUn4njMRAuT0/8GzqGn6zGn9014BAkT7VSVf2H
-diplotaxis.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFcVtfOj0ti6eYsFSq2gbBGhaf8E7p/QiO3/MVX1D32T
-2a06:a004:3025:1::33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
-2a06:a004:3025:1::31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
-2a06:a004:3025:1::32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G
-2a06:a003:515d:1::33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
-2a06:a003:515d:1::31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
-2a06:a003:515d:1::32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G
-2a06:a003:d019:1::33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
-2a06:a003:d019:1::31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
-2a06:a003:d019:1::32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G
-df-ykl.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEwsKl1Bv8HJa+rO2KymEDhKEcDY3s9CQmDQ8i/tHf4E
-df-ymk.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIo6bcVtpZ+pRVs0vNaUgC0kY5ddPtWryUmFQTZjA+73
-df-ymf.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2el374ejNXqF+yyMxOOhY2DWSJB9tbjr2H7gFfQtbc
-2001:910:1204:1::33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
-2001:910:1204:1::31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
-2001:910:1204:1::32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G
-192.168.1.23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPtsVFIoIu6tnYrzlcCbBiQXxNkFSWVMhMznUuSxGZ22
-2a01:e0a:5e4:1d0:223:24ff:feaf:fdec ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsZas74RT6lCZwuUOPR23nPdbSdpWORyAmRgjoiMVHK