refactor(users/flokli): unify archeology and archivist
This merges the two directories together, and explains the two different AWS profiles and what they're used for. Change-Id: Ieaa09be5af02491056f5ad83b1d639e2de9a218b Reviewed-on: https://cl.snix.dev/c/snix/+/30102 Autosubmit: Florian Klink <flokli@flokli.de> Reviewed-by: Ryan Lahfa <masterancpp@gmail.com> Tested-by: besadii
This commit is contained in:
parent
580f03f6fd
commit
2bdb497c85
12 changed files with 74 additions and 74 deletions
|
|
@ -3,7 +3,7 @@
|
|||
{
|
||||
imports = [
|
||||
"${modulesPath}/virtualisation/amazon-image.nix"
|
||||
../profiles/archeology.nix
|
||||
../profiles/archivist.nix
|
||||
];
|
||||
|
||||
systemd.timers.parse-bucket-logs = {
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
};
|
||||
|
||||
systemd.services.parse-bucket-logs = {
|
||||
path = [ depot.users.flokli.archeology.parse-bucket-logs ];
|
||||
path = [ depot.users.flokli.archivist.parse-bucket-logs ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = (pkgs.writers.writePython3 "parse-bucket-logs-continuously"
|
||||
|
|
@ -25,10 +25,10 @@
|
|||
};
|
||||
|
||||
environment.systemPackages = [
|
||||
depot.users.flokli.archeology.parse-bucket-logs
|
||||
depot.users.flokli.archivist.parse-bucket-logs
|
||||
];
|
||||
|
||||
networking.hostName = "archeology-ec2";
|
||||
networking.hostName = "archivist-ec2";
|
||||
|
||||
system.stateVersion = "23.05"; # Did you read the comment?
|
||||
}
|
||||
|
|
@ -47,7 +47,7 @@ while True:
|
|||
# Invoke parse-bucket-logs script inside a tempdir and upload on success.
|
||||
with tempfile.TemporaryDirectory() as td:
|
||||
work_file_name = os.path.join(td, "output.parquet")
|
||||
args = ["archeology-parse-bucket-logs", src, work_file_name]
|
||||
args = ["archivist-parse-bucket-logs", src, work_file_name]
|
||||
subprocess.run(
|
||||
args,
|
||||
check=True # throw exception if nonzero exit code
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ depot, pkgs, lib, ... }:
|
||||
{ depot, pkgs, ... }:
|
||||
|
||||
let
|
||||
# assumes `name` is configured appropriately in your .ssh/config
|
||||
|
|
@ -11,13 +11,13 @@ let
|
|||
|
||||
in
|
||||
depot.nix.readTree.drvTargets rec {
|
||||
archeologyEc2System = (depot.ops.nixos.nixosFor ({ ... }: {
|
||||
archivistEc2System = (depot.ops.nixos.nixosFor ({ ... }: {
|
||||
imports = [
|
||||
./archeology-ec2/configuration.nix
|
||||
./archivist-ec2/configuration.nix
|
||||
];
|
||||
})).config.system.build.toplevel;
|
||||
|
||||
deploy-archeology-ec2 = (deployScript "archeology-ec2" archeologyEc2System);
|
||||
deploy-archivist-ec2 = (deployScript "archivist-ec2" archivistEc2System);
|
||||
|
||||
nixosTvixCacheSystem = (depot.ops.nixos.nixosFor ({ ... }: {
|
||||
imports = [
|
||||
|
|
@ -28,7 +28,7 @@ depot.nix.readTree.drvTargets rec {
|
|||
deploy-nixos-tvix-cache = (deployScript "root@nixos.tvix.store" nixosTvixCacheSystem);
|
||||
|
||||
deps = (depot.nix.lazy-deps {
|
||||
deploy-archeology-ec2.attr = "users.flokli.nixos.deploy-archeology-ec2";
|
||||
deploy-archivist-ec2.attr = "users.flokli.nixos.deploy-archivist-ec2";
|
||||
aws.attr = "third_party.nixpkgs.awscli";
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Set of unconditional config options applicable to all archeology machines.
|
||||
# Set of unconditional config options applicable to all archivist machines.
|
||||
|
||||
{ pkgs, ... }:
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue