mucbot: flakify
This commit is contained in:
parent
446f93bf00
commit
906ef601d3
25
flake.lock
25
flake.lock
|
@ -36,6 +36,7 @@
|
|||
"nixpkgs": "nixpkgs",
|
||||
"scrapers": "scrapers",
|
||||
"secrets": "secrets",
|
||||
"tigger": "tigger",
|
||||
"yammat": "yammat"
|
||||
}
|
||||
},
|
||||
|
@ -57,11 +58,11 @@
|
|||
},
|
||||
"secrets": {
|
||||
"locked": {
|
||||
"lastModified": 1615587539,
|
||||
"narHash": "sha256-5v3azueR83Sxf0XBgJXc0v8keZPA1yocMJgpgtKRdl4=",
|
||||
"lastModified": 1616412180,
|
||||
"narHash": "sha256-NIZ7+4hDOF8i+aUeDW0scXnE90b1FbvXuwD8eyx3XLo=",
|
||||
"ref": "master",
|
||||
"rev": "621eae36dd5c117454dea90604b220e7a4f0c7d8",
|
||||
"revCount": 95,
|
||||
"rev": "0185c43bf98d7c47b0e83c6f88ffcc2aa7d97b0d",
|
||||
"revCount": 96,
|
||||
"type": "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"
|
||||
}
|
||||
},
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
17
flake.nix
17
flake.nix
|
@ -8,9 +8,11 @@
|
|||
yammat.inputs.nixpkgs.follows = "nixpkgs";
|
||||
scrapers.url = "git+https://gitea.c3d2.de/astro/scrapers.git";
|
||||
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
|
||||
forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
|
||||
|
||||
|
@ -77,6 +79,8 @@
|
|||
grafana-nixos-rebuild = mkDeploy "grafana" "grafana.hq.c3d2.de";
|
||||
|
||||
hydra-nixos-rebuild = mkDeploy "hydra" hostRegistry.hosts.hydra.ip4;
|
||||
|
||||
mucbot-nixos-rebuild = mkDeploy "mucbot" hostRegistry.hosts.mucbot.ip4;
|
||||
});
|
||||
|
||||
nixosConfigurations = let
|
||||
|
@ -200,6 +204,17 @@
|
|||
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;
|
||||
|
|
|
@ -105,6 +105,11 @@ rec {
|
|||
ip4 = "172.20.73.49";
|
||||
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;
|
||||
|
|
|
@ -1,16 +1,6 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
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"
|
||||
];
|
||||
{ config, pkgs, lib, tigger, ... }:
|
||||
|
||||
{
|
||||
networking.hostName = "mucbot";
|
||||
networking.interfaces.eth0.ipv4.addresses = [{
|
||||
address = "172.20.73.27";
|
||||
|
@ -30,8 +20,8 @@ in {
|
|||
enable = true;
|
||||
user = "tigger";
|
||||
group = "tigger";
|
||||
jid = import ../../../secrets/hosts/mucbot/jabber-jid.nix;
|
||||
password = import ../../../secrets/hosts/mucbot/jabber-password.nix;
|
||||
jid = pkgs.mucbot.jid;
|
||||
password = pkgs.mucbot.password;
|
||||
mucs =
|
||||
[ "c3d2@chat.c3d2.de/Astrobot" "international@chat.c3d2.de/Astrobot" ];
|
||||
};
|
|
@ -6,4 +6,6 @@ final: prev:
|
|||
|
||||
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