aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cluster/prod/cluster.nix8
-rw-r--r--cluster/prod/known_hosts2
-rw-r--r--cluster/prod/ssh_config4
-rwxr-xr-xdeploy_pki2
-rwxr-xr-xupgrade_nixos2
5 files changed, 16 insertions, 2 deletions
diff --git a/cluster/prod/cluster.nix b/cluster/prod/cluster.nix
index 59fbcb5..802d084 100644
--- a/cluster/prod/cluster.nix
+++ b/cluster/prod/cluster.nix
@@ -80,6 +80,14 @@
lan_endpoint = "192.168.5.116:33799";
endpoint = "109.136.55.235:33733";
}
+ {
+ hostname = "abricot";
+ site_name = "scorpio";
+ publicKey = "Sm9cmNZ/BfWVPFflMO+fuyiera4r203b/dKhHTQmBFg=";
+ IP = "10.83.4.1";
+ lan_endpoint = "192.168.1.41:33799";
+ endpoint = "82.65.41.110:33741";
+ }
];
# Bootstrap IPs for Consul cluster,
diff --git a/cluster/prod/known_hosts b/cluster/prod/known_hosts
index af32b6b..ec20dac 100644
--- a/cluster/prod/known_hosts
+++ b/cluster/prod/known_hosts
@@ -7,3 +7,5 @@ df-ymf.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2el374ejNXqF+
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
+192.168.1.115 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPhHUQtc5lukPMFkiWf/sTgaUpwNFXHCJoQKu4ooRFy+
+192.168.1.41 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPhHUQtc5lukPMFkiWf/sTgaUpwNFXHCJoQKu4ooRFy+
diff --git a/cluster/prod/ssh_config b/cluster/prod/ssh_config
index 11dcc15..a4df1f9 100644
--- a/cluster/prod/ssh_config
+++ b/cluster/prod/ssh_config
@@ -27,3 +27,7 @@ Host df-ymf
Host df-ymk
HostName df-ymk.machine.deuxfleurs.fr
+
+Host abricot
+ HostName 192.168.1.41
+ # HostName abricot.machine.deuxfleurs.fr
diff --git a/deploy_pki b/deploy_pki
index 471ff63..63c237b 100755
--- a/deploy_pki
+++ b/deploy_pki
@@ -30,7 +30,7 @@ for file in nomad-ca.crt nomad$YEAR.crt nomad$YEAR.key \
do
if pass $PKI/$file >/dev/null; then
write_pass $PKI/$file /var/lib/nomad/pki/$file
- cmd "chown \$(stat -c %u /var/lib/nomad/client/client-id) /var/lib/nomad/pki/$file"
+ cmd "chown \$(stat -c %u /var/lib/private/nomad/) /var/lib/nomad/pki/$file"
fi
done
diff --git a/upgrade_nixos b/upgrade_nixos
index dcfeb5f..e04cfe0 100755
--- a/upgrade_nixos
+++ b/upgrade_nixos
@@ -1,6 +1,6 @@
#!/usr/bin/env ./sshtool
-if [ "$CLUSTER" = "staging" -o "$NIXHOST" = "concombre" -o "$NIXHOST" = "courgette" -o "$NIXHOST" = "celeri" ]; then
+if [ "$CLUSTER" = "staging" -o "$NIXHOST" = "concombre" -o "$NIXHOST" = "courgette" -o "$NIXHOST" = "celeri" -o "$NIXHOST" = "abricot" -o "$NIXHOST" = "df-ymk" -o "$NIXHOST" = "df-ymf" -o "$NIXHOST" = "df-ykl" ]; then
cmd nix-channel --add https://nixos.org/channels/nixos-22.11 nixos
else
cmd nix-channel --add https://nixos.org/channels/nixos-22.05 nixos