From 31b643e2e0f939e717aa90cd7d877903caffa869 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 10 May 2021 00:28:27 +0200 Subject: [PATCH] kibana: flakify --- flake.nix | 10 ++++++++++ host-registry.nix | 5 +++++ .../kibana/{configuration.nix => default.nix} | 7 ------- krops.nix | 1 - 4 files changed, 15 insertions(+), 8 deletions(-) rename hosts/containers/kibana/{configuration.nix => default.nix} (91%) diff --git a/flake.nix b/flake.nix index 1e524b35..54d1c893 100644 --- a/flake.nix +++ b/flake.nix @@ -78,6 +78,8 @@ hydra-nixos-rebuild = mkDeploy "hydra" hostRegistry.hosts.hydra.ip4; mucbot-nixos-rebuild = mkDeploy "mucbot" hostRegistry.hosts.mucbot.ip4; + + kibana-nixos-rebuild = mkDeploy "kibana" hostRegistry.hosts.kibana.ip4; }); nixosConfigurations = let @@ -212,6 +214,14 @@ system = "x86_64-linux"; }; + kibana = nixosSystem' { + modules = [ + ./lib/lxc-container.nix + ./hosts/containers/kibana + ]; + system = "x86_64-linux"; + }; + }; nixosModules.c3d2 = import ./lib; diff --git a/host-registry.nix b/host-registry.nix index 1ca9c75d..baa7d3d2 100644 --- a/host-registry.nix +++ b/host-registry.nix @@ -110,6 +110,11 @@ rec { ip4 = "172.20.73.27"; ip6 = "2a02:8106:208:5282:28db:dff:fe6b:e89a"; }; + + kibana = { + ip4 = "172.20.73.44"; + ip6 = "2a02:8106:208:5282:460:7cff:fe28:76b2"; + }; }; hqGlobal = builtins.attrNames hosts; diff --git a/hosts/containers/kibana/configuration.nix b/hosts/containers/kibana/default.nix similarity index 91% rename from hosts/containers/kibana/configuration.nix rename to hosts/containers/kibana/default.nix index 1a0e8150..e5ad02af 100644 --- a/hosts/containers/kibana/configuration.nix +++ b/hosts/containers/kibana/default.nix @@ -1,13 +1,6 @@ { config, pkgs, lib, modulesPath, ... }: { - imports = [ - (modulesPath + "/profiles/minimal.nix") - ../../../lib - ../../../lib/lxc-container.nix - ../../../lib/shared.nix - ]; - networking.hostName = "kibana"; networking.interfaces.eth0.ipv4.addresses = [{ address = "172.20.73.44"; diff --git a/krops.nix b/krops.nix index 7f230b1a..8f8a20f5 100644 --- a/krops.nix +++ b/krops.nix @@ -23,5 +23,4 @@ let }; in { ledstripes = deployContainer "ledstripes" "172.22.99.168"; - kibana = deployContainer "kibana" "172.20.73.44"; }