Allow phobos local deployment. Make interface consistent.

main
Joshua Potter 2024-01-23 20:06:58 -07:00
parent 8725aed4b1
commit 439bb14368
4 changed files with 29 additions and 15 deletions

View File

@ -37,12 +37,12 @@
thebe = tapir.pkgs; thebe = tapir.pkgs;
}; };
nodeSpecialArgs = { nodeSpecialArgs = {
framework = {
inherit (tapir) home-manager;
};
deimos = { deimos = {
inherit (tapir) sops-nix; inherit (tapir) sops-nix;
}; };
framework = {
inherit (tapir) home-manager;
};
phobos = { phobos = {
inherit (tapir) home-manager; inherit (tapir) home-manager;
}; };
@ -52,21 +52,37 @@
}; };
}; };
# Local machines. Deploy using `colmena apply-local [--sudo]` deimos = {
imports = [ ./hive/deimos ];
deployment = {
allowLocalDeployment = false;
targetHost = "24.199.110.222";
};
};
framework = { framework = {
imports = [ ./hive/framework ]; imports = [ ./hive/framework ];
deployment = { deployment = {
allowLocalDeployment = true; allowLocalDeployment = true;
targetHost = null; # Disable SSH deployment. targetHost = null;
}; };
}; };
# Remote machines. Deploy using `colmena apply` phobos = {
imports = [ ./hive/phobos ];
deployment = {
allowLocalDeployment = true;
targetHost = "144.126.218.252";
};
};
deimos.imports = [ ./hive/deimos ]; thebe = {
phobos.imports = [ ./hive/phobos ]; imports = [ ./hive/thebe ];
thebe.imports = [ ./hive/thebe ]; deployment = {
allowLocalDeployment = false;
targetHost = "64.23.168.148";
};
};
}; };
packages.${system}.digital-ocean = { packages.${system}.digital-ocean = {

View File

@ -7,8 +7,6 @@
../../services/portfolio.nix ../../services/portfolio.nix
]; ];
deployment.targetHost = "24.199.110.222";
networking = { networking = {
hostName = "deimos"; hostName = "deimos";
firewall = { firewall = {

View File

@ -5,8 +5,6 @@
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
]; ];
deployment.targetHost = "144.126.218.252";
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
gcc gcc
@ -60,6 +58,10 @@
programs.mosh.enable = true; programs.mosh.enable = true;
# Our NixOS droplet's do not have a root password set. Disable so we can still
# run commands that require sudo (e.g. `colmena apply-local --sudo`).
security.sudo.wheelNeedsPassword = false;
services.openssh.enable = true; services.openssh.enable = true;
time.timeZone = "America/Denver"; time.timeZone = "America/Denver";

View File

@ -7,8 +7,6 @@
../../services/forgejo.nix ../../services/forgejo.nix
]; ];
deployment.targetHost = "64.23.168.148";
networking = { networking = {
hostName = "thebe"; hostName = "thebe";
firewall = { firewall = {