aboutsummaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2022-10-06 13:30:21 +0200
committerKarel Kočí <cynerd@email.cz>2022-10-06 13:30:21 +0200
commitfbb909aedbc677f86f6cdebf1d1ba819caebf70a (patch)
tree3820084f90ea049c8f5e96abc6dd92d07e3b0a76 /nixos
parente8c8fe8d137f8ddb8dc4e547c80e762cd849bee4 (diff)
downloadnixos-personal-fbb909aedbc677f86f6cdebf1d1ba819caebf70a.tar.gz
nixos-personal-fbb909aedbc677f86f6cdebf1d1ba819caebf70a.tar.bz2
nixos-personal-fbb909aedbc677f86f6cdebf1d1ba819caebf70a.zip
nixos/mrpump: use vpsadminos container configuration
Diffstat (limited to 'nixos')
-rw-r--r--nixos/machine/default.nix4
-rw-r--r--nixos/machine/mrpump.nix3
2 files changed, 5 insertions, 2 deletions
diff --git a/nixos/machine/default.nix b/nixos/machine/default.nix
index 4286d06..2efe2da 100644
--- a/nixos/machine/default.nix
+++ b/nixos/machine/default.nix
@@ -3,10 +3,12 @@
machine-binky = import ./binky.nix;
machine-dean = import ./dean.nix;
machine-errol = import ./errol.nix;
- machine-lipwig = import ./lipwig.nix;
machine-ridcully = import ./ridcully.nix;
machine-susan = import ./susan.nix;
+ machine-lipwig = import ./lipwig.nix;
+ machine-mrpump = import ./mrpump.nix;
+
machine-gaspode = import ./gaspode.nix;
machine-spt-omnia = import ./spt-omnia.nix;
diff --git a/nixos/machine/mrpump.nix b/nixos/machine/mrpump.nix
index 818652c..66cdbb5 100644
--- a/nixos/machine/mrpump.nix
+++ b/nixos/machine/mrpump.nix
@@ -13,9 +13,10 @@ with lib;
enable = true;
services.docker = {
registrationConfigFile = "/run/secrets/gitlab-runner-registration";
- executor = "docker";
tagList = ["docker"];
runUntagged = true;
+ executor = "docker";
+ dockerImage = "alpine";
description = "Docker runner";
};
};