Deuxfleurs/nixcfg
17
6
Fork 2
Code Issues 15 Pull requests 2 Projects Releases Wiki Activity

added scorpio site and abricot node

Browse source
This commit is contained in:
Adrien 2023-03-15 17:10:38 +01:00
parent c681f63222
commit 031d029e10
5 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cluster/prod/cluster.nix
View file

@ -80,6 +80,14 @@
lan_endpoint = "192.168.5.116:33799"; lan_endpoint = "192.168.5.116:33799";
endpoint = "109.136.55.235:33733"; 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, # Bootstrap IPs for Consul cluster,

2
cluster/prod/known_hosts
View file

@ -7,3 +7,5 @@ df-ymf.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2el374ejNXqF+
celeri.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA celeri.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
concombre.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR concombre.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
courgette.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G courgette.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G
192.168.1.115 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPhHUQtc5lukPMFkiWf/sTgaUpwNFXHCJoQKu4ooRFy+
192.168.1.41 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPhHUQtc5lukPMFkiWf/sTgaUpwNFXHCJoQKu4ooRFy+

4
cluster/prod/ssh_config
View file

@ -27,3 +27,7 @@ Host df-ymf
Host df-ymk Host df-ymk
HostName df-ymk.machine.deuxfleurs.fr HostName df-ymk.machine.deuxfleurs.fr
Host abricot
HostName 192.168.1.41
# HostName abricot.machine.deuxfleurs.fr

2
deploy_pki
View file

@ -30,7 +30,7 @@ for file in nomad-ca.crt nomad$YEAR.crt nomad$YEAR.key \
do do
if pass $PKI/$file >/dev/null; then if pass $PKI/$file >/dev/null; then
write_pass $PKI/$file /var/lib/nomad/pki/$file 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 fi
done done

2
upgrade_nixos
View file

@ -1,6 +1,6 @@
#!/usr/bin/env ./sshtool #!/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 cmd nix-channel --add https://nixos.org/channels/nixos-22.11 nixos
else else
cmd nix-channel --add https://nixos.org/channels/nixos-22.05 nixos cmd nix-channel --add https://nixos.org/channels/nixos-22.05 nixos