tixie/nixcfg
1
0
Fork 0
forked from Deuxfleurs/nixcfg
Code Pull requests Activity

staging: cluster upgrades

Browse source
This commit is contained in:
Alex 2024-01-22 17:15:29 +01:00
parent 6db49e0059
commit 27242fbf70
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cluster/staging/app/im/deploy/im-nix.hcl
View file

@ -55,6 +55,7 @@ job "im" {
task "synapse" { task "synapse" {
driver = "nix2" driver = "nix2"
config { config {
nixpkgs = "github:nixos/nixpkgs/nixos-23.11"
packages = [ packages = [
"#cacert", "#cacert",
"#bash", "#bash",

2
cluster/staging/cluster.nix
View file

@ -118,7 +118,7 @@
{ {
config = [ config = [
{ {
default_nixpkgs = "github:nixos/nixpkgs/nixos-22.11"; default_nixpkgs = "github:nixos/nixpkgs/nixos-23.11";
} }
]; ];
} }

3
cluster/staging/known_hosts
View file

@ -13,3 +13,6 @@ df-pw5.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK/dJIxioCkfeeh
2a01:cb05:911e:ec00:223:24ff:feb0:ea82 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJnpO6zpLWsyyugOoOj+2bUow9TUrcWgURFGGaoyu+co 2a01:cb05:911e:ec00:223:24ff:feb0:ea82 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJnpO6zpLWsyyugOoOj+2bUow9TUrcWgURFGGaoyu+co
carcajou.machine.staging.deuxfleurs.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ carcajou.machine.staging.deuxfleurs.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ
caribou.machine.staging.deuxfleurs.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPtsVFIoIu6tnYrzlcCbBiQXxNkFSWVMhMznUuSxGZ22 caribou.machine.staging.deuxfleurs.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPtsVFIoIu6tnYrzlcCbBiQXxNkFSWVMhMznUuSxGZ22
df-pw5.machine.staging.deuxfleurs.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK/dJIxioCkfeehxeGiZR7qquYGoqEH/YrRJ/ukEcaLH
origan.machine.staging.deuxfleurs.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsZas74RT6lCZwuUOPR23nPdbSdpWORyAmRgjoiMVHK
piranha.machine.staging.deuxfleurs.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJnpO6zpLWsyyugOoOj+2bUow9TUrcWgURFGGaoyu+co

4
nix/nomad-driver-nix2.nix
View file

@ -7,10 +7,10 @@ pkgs.buildGoModule rec {
src = builtins.fetchGit { src = builtins.fetchGit {
url = "https://git.deuxfleurs.fr/Deuxfleurs/nomad-driver-nix2"; url = "https://git.deuxfleurs.fr/Deuxfleurs/nomad-driver-nix2";
rev = "59aba7607507193587be7c24229dc71066e3ae87"; rev = "98871a2d786f2627f1699d0ae49e7d6d3792f469";
}; };
vendorSha256 = "sha256-EQdTxVOBRYQjg7kAB+pFJYcNwk0zlsjjJxM+EO/cK84="; vendorHash = "sha256-EQdTxVOBRYQjg7kAB+pFJYcNwk0zlsjjJxM+EO/cK84=";
postInstall = '' postInstall = ''
mv $out/bin/nomad-driver-nix2 $out/bin/nix2 mv $out/bin/nomad-driver-nix2 $out/bin/nix2

2
upgrade_nixos
View file

@ -1,7 +1,7 @@
#!/usr/bin/env ./sshtool #!/usr/bin/env ./sshtool
if [ "$CLUSTER" = "staging" ]; then if [ "$CLUSTER" = "staging" ]; then
cmd nix-channel --add https://nixos.org/channels/nixos-23.05 nixos cmd nix-channel --add https://nixos.org/channels/nixos-23.11 nixos
else else
cmd nix-channel --add https://nixos.org/channels/nixos-22.11 nixos cmd nix-channel --add https://nixos.org/channels/nixos-22.11 nixos
fi fi