dev/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

nixos: Remove containers from global deploy list

Browse Source
This commit is contained in:
Jack O'Sullivan 2022-06-06 13:25:05 +01:00
parent 796e1582a3
commit 77eaaf52c7
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/boxes/colony/vms/shill/containers/middleman.nix
View File

@ -25,6 +25,7 @@
config = mkMerge [
{
my = {
deploy.enable = false;
server.enable = true;
secrets = {

1
nixos/boxes/colony/vms/shill/containers/vaultwarden.nix
View File

@ -27,6 +27,7 @@
config = mkMerge [
{
my = {
deploy.enable = false;
server.enable = true;
secrets = {

2
nixos/default.nix
View File

@ -51,7 +51,7 @@ let
system.name = name;
networking = {
domain = let d = config'.assignments.internal.domain; in mkIf (d != null) (mkDefault' d);
domain = let d = config'.assignments.internal.domain or null; in mkIf (d != null) (mkDefault' d);
hostName = mkDefault (config'.assignments.internal.name or name);
};
nixpkgs = {

2
nixos/modules/deploy-rs.nix
View File

@ -80,7 +80,7 @@ in
config = mkMerge [
{
my.deploy.enable = mkIf config.my.build.isDevVM false;
my.deploy.enable = mkIf (config.my.build.isDevVM || config.boot.isContainer) false;
}
(mkIf cfg.enable {
my.deploy.node = {