mucbot: flakify
This commit is contained in:
parent
446f93bf00
commit
906ef601d3
25
flake.lock
25
flake.lock
|
@ -36,6 +36,7 @@
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"scrapers": "scrapers",
|
"scrapers": "scrapers",
|
||||||
"secrets": "secrets",
|
"secrets": "secrets",
|
||||||
|
"tigger": "tigger",
|
||||||
"yammat": "yammat"
|
"yammat": "yammat"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -57,11 +58,11 @@
|
||||||
},
|
},
|
||||||
"secrets": {
|
"secrets": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1615587539,
|
"lastModified": 1616412180,
|
||||||
"narHash": "sha256-5v3azueR83Sxf0XBgJXc0v8keZPA1yocMJgpgtKRdl4=",
|
"narHash": "sha256-NIZ7+4hDOF8i+aUeDW0scXnE90b1FbvXuwD8eyx3XLo=",
|
||||||
"ref": "master",
|
"ref": "master",
|
||||||
"rev": "621eae36dd5c117454dea90604b220e7a4f0c7d8",
|
"rev": "0185c43bf98d7c47b0e83c6f88ffcc2aa7d97b0d",
|
||||||
"revCount": 95,
|
"revCount": 96,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git"
|
"url": "ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git"
|
||||||
},
|
},
|
||||||
|
@ -70,6 +71,22 @@
|
||||||
"url": "ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git"
|
"url": "ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"tigger": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1592956241,
|
||||||
|
"narHash": "sha256-ghJ8gD9O7VYBXCnEf1XgqH1CYLfo7yFh4nLLUWUn5mc=",
|
||||||
|
"owner": "astro",
|
||||||
|
"repo": "tigger",
|
||||||
|
"rev": "963619d33cf918cabc379b50ef99399d2be1980b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "astro",
|
||||||
|
"repo": "tigger",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"yammat": {
|
"yammat": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
17
flake.nix
17
flake.nix
|
@ -8,9 +8,11 @@
|
||||||
yammat.inputs.nixpkgs.follows = "nixpkgs";
|
yammat.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
scrapers.url = "git+https://gitea.c3d2.de/astro/scrapers.git";
|
scrapers.url = "git+https://gitea.c3d2.de/astro/scrapers.git";
|
||||||
scrapers.flake = false;
|
scrapers.flake = false;
|
||||||
|
tigger.url = "github:astro/tigger";
|
||||||
|
tigger.flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, secrets, nixos-hardware, yammat, scrapers }:
|
outputs = { self, nixpkgs, secrets, nixos-hardware, yammat, scrapers, tigger }:
|
||||||
let
|
let
|
||||||
forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
|
forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
|
||||||
|
|
||||||
|
@ -77,6 +79,8 @@
|
||||||
grafana-nixos-rebuild = mkDeploy "grafana" "grafana.hq.c3d2.de";
|
grafana-nixos-rebuild = mkDeploy "grafana" "grafana.hq.c3d2.de";
|
||||||
|
|
||||||
hydra-nixos-rebuild = mkDeploy "hydra" hostRegistry.hosts.hydra.ip4;
|
hydra-nixos-rebuild = mkDeploy "hydra" hostRegistry.hosts.hydra.ip4;
|
||||||
|
|
||||||
|
mucbot-nixos-rebuild = mkDeploy "mucbot" hostRegistry.hosts.mucbot.ip4;
|
||||||
});
|
});
|
||||||
|
|
||||||
nixosConfigurations = let
|
nixosConfigurations = let
|
||||||
|
@ -200,6 +204,17 @@
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
mucbot = nixosSystem' {
|
||||||
|
modules = [
|
||||||
|
./lib/lxc-container.nix
|
||||||
|
"${tigger}/module.nix"
|
||||||
|
{ nixpkgs.overlays = [ secrets.overlays.mucbot ]; }
|
||||||
|
./hosts/containers/mucbot
|
||||||
|
];
|
||||||
|
extraArgs = { inherit tigger; };
|
||||||
|
system = "x86_64-linux";
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nixosModules.c3d2 = import ./lib;
|
nixosModules.c3d2 = import ./lib;
|
||||||
|
|
|
@ -105,6 +105,11 @@ rec {
|
||||||
ip4 = "172.20.73.49";
|
ip4 = "172.20.73.49";
|
||||||
ip6 = "2a02:8106:208:5282:e03c:d7ff:fe8e:fe16";
|
ip6 = "2a02:8106:208:5282:e03c:d7ff:fe8e:fe16";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
mucbot = {
|
||||||
|
ip4 = "172.20.73.27";
|
||||||
|
ip6 = "2a02:8106:208:5282:28db:dff:fe6b:e89a";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
hqGlobal = builtins.attrNames hosts;
|
hqGlobal = builtins.attrNames hosts;
|
||||||
|
|
|
@ -1,16 +1,6 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, tigger, ... }:
|
||||||
|
|
||||||
let
|
|
||||||
tiggerGit = builtins.fetchTarball
|
|
||||||
"https://github.com/astro/tigger/archive/master.tar.gz";
|
|
||||||
in {
|
|
||||||
imports = [
|
|
||||||
../../../lib/lxc-container.nix
|
|
||||||
../../../lib/shared.nix
|
|
||||||
../../../lib/admins.nix
|
|
||||||
"${tiggerGit}/module.nix"
|
|
||||||
];
|
|
||||||
|
|
||||||
|
{
|
||||||
networking.hostName = "mucbot";
|
networking.hostName = "mucbot";
|
||||||
networking.interfaces.eth0.ipv4.addresses = [{
|
networking.interfaces.eth0.ipv4.addresses = [{
|
||||||
address = "172.20.73.27";
|
address = "172.20.73.27";
|
||||||
|
@ -30,8 +20,8 @@ in {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = "tigger";
|
user = "tigger";
|
||||||
group = "tigger";
|
group = "tigger";
|
||||||
jid = import ../../../secrets/hosts/mucbot/jabber-jid.nix;
|
jid = pkgs.mucbot.jid;
|
||||||
password = import ../../../secrets/hosts/mucbot/jabber-password.nix;
|
password = pkgs.mucbot.password;
|
||||||
mucs =
|
mucs =
|
||||||
[ "c3d2@chat.c3d2.de/Astrobot" "international@chat.c3d2.de/Astrobot" ];
|
[ "c3d2@chat.c3d2.de/Astrobot" "international@chat.c3d2.de/Astrobot" ];
|
||||||
};
|
};
|
|
@ -6,4 +6,6 @@ final: prev:
|
||||||
|
|
||||||
pile = prev.callPackage ./pile.nix { };
|
pile = prev.callPackage ./pile.nix { };
|
||||||
|
|
||||||
|
# Cut down build time of a Nix-2.4 dependency
|
||||||
|
mdbook = prev.mdbook.overrideAttrs (oa: { doCheck = false; });
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue