steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

[WIP] feat: migrate containers to vmd102066

Browse source
This commit is contained in:
steveej 2022-11-03 16:48:06 +01:00
parent 7cd97ca6d9
commit 76c64678ae
20 changed files with 346 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/os/devices/vmd32387.contaboserver.net/pkg.nix
View file

@ -31,7 +31,7 @@
};
services.gitlab-runner = {
enable = true;
enable = false;
extraPackages = with pkgs; [ bash gitlab-runner nix gitFull git-crypt ];

8
nix/os/devices/vmd32387.contaboserver.net/system.nix
View file

@ -98,13 +98,7 @@ in {
networking.useHostResolvConf = true;
containers = {
bkpTarget = import ../../containers/backup-target.nix {
hostAddress = "192.168.100.18";
localAddress = "192.168.100.19";
containerBackupCfg = passwords.storage.backupTarget;
};
};
containers = { };
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions

44
nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix
View file

@ -1,51 +1,15 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.11";
ref = "nixos-22.05";
rev = ''
<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '
<% git ls-remote https://github.com/nixos/nixpkgs nixos-22.05 | awk '{ print $1 }' | tr -d '
' -%>'';
};
in {
inherit nixpkgs;
nixos = nixpkgs // { suffix = "/nixos"; };
"channels-nixos-stable" = nixpkgs;
"channels-nixos-21.05" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.05";
rev = ''
<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.05 | awk '{ print $1 }' | tr -d '
' -%>'';
};
"channels-nixos-20.09" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09";
rev = ''
<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.09 | awk '{ print $1 }' | tr -d '
' -%>'';
};
"channels-nixos-20.03" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.03";
rev = ''
<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.03 | awk '{ print $1 }' | tr -d '
' -%>'';
};
"channels-nixos-19.09" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-19.09";
rev = ''
<% git ls-remote https://github.com/nixos/nixpkgs nixos-19.09 | awk '{ print $1 }' | tr -d '
' -%>'';
};
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
rev = ''
<% git ls-remote https://github.com/nixos/nixpkgs nixos-unstable | awk '{ print $1 }' | tr -d '
' -%>'';
};
"nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
@ -55,9 +19,9 @@ in {
};
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-21.05";
ref = "release-22.05";
rev = ''
<% git ls-remote https://github.com/nix-community/home-manager.git release-21.05 | awk '{ print $1 }' | tr -d '
<% git ls-remote https://github.com/nix-community/home-manager.git release-22.05 | awk '{ print $1 }' | tr -d '
' -%>'';
};
}