krops.nix: upgrade to nixos-20.09
This commit is contained in:
parent
633a0e5b8c
commit
a7c49d0ab3
12
krops.nix
12
krops.nix
|
@ -5,11 +5,11 @@ let
|
||||||
lib = import "${krops}/lib";
|
lib = import "${krops}/lib";
|
||||||
pkgs = import "${krops}/pkgs" {};
|
pkgs = import "${krops}/pkgs" {};
|
||||||
|
|
||||||
hostSource = path:
|
hostSource = path: nixos-branch:
|
||||||
lib.evalSource [ {
|
lib.evalSource [ {
|
||||||
nixpkgs.git = {
|
nixpkgs.git = {
|
||||||
ref = "origin/nixos-20.03";
|
ref = "origin/${nixos-branch}";
|
||||||
url = "https://github.com/NixOS/nixpkgs-channels.git";
|
url = "https://github.com/NixOS/nixpkgs.git";
|
||||||
};
|
};
|
||||||
nixpkgs-unstable.git = {
|
nixpkgs-unstable.git = {
|
||||||
ref = "origin/master";
|
ref = "origin/master";
|
||||||
|
@ -24,7 +24,7 @@ let
|
||||||
|
|
||||||
deployContainer = containerName: host:
|
deployContainer = containerName: host:
|
||||||
pkgs.krops.writeDeploy containerName {
|
pkgs.krops.writeDeploy containerName {
|
||||||
source = hostSource "containers/${containerName}";
|
source = hostSource "containers/${containerName}" "nixos-20.09";
|
||||||
target = "root@${host}";
|
target = "root@${host}";
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
@ -34,13 +34,13 @@ in {
|
||||||
kibana = deployContainer "kibana" "172.20.73.44";
|
kibana = deployContainer "kibana" "172.20.73.44";
|
||||||
|
|
||||||
glotzbert = pkgs.krops.writeDeploy "glotzbert" {
|
glotzbert = pkgs.krops.writeDeploy "glotzbert" {
|
||||||
source = hostSource "glotzbert";
|
source = hostSource "glotzbert" "nixos-20.09";
|
||||||
target = lib.mkTarget "k-ot@glotzbert.hq.c3d2.de" // {
|
target = lib.mkTarget "k-ot@glotzbert.hq.c3d2.de" // {
|
||||||
sudo = true;
|
sudo = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
pulsebert = pkgs.krops.writeDeploy "pulsebert" {
|
pulsebert = pkgs.krops.writeDeploy "pulsebert" {
|
||||||
source = hostSource "pulsebert";
|
source = hostSource "pulsebert" "nixos-unstable";
|
||||||
target = lib.mkTarget "k-ot@pulsebert.hq.c3d2.de" // {
|
target = lib.mkTarget "k-ot@pulsebert.hq.c3d2.de" // {
|
||||||
sudo = true;
|
sudo = true;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue