From 6958e86c94acb85d15dabae7e6f547409a5764a9 Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Mon, 13 Jun 2022 01:12:01 +0100 Subject: [PATCH] nixos/chatterbox: Add Netdata --- nixos/boxes/colony/vms/shill/containers/chatterbox.nix | 3 ++- nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/boxes/colony/vms/shill/containers/chatterbox.nix b/nixos/boxes/colony/vms/shill/containers/chatterbox.nix index 2352c9a..1d16dd1 100644 --- a/nixos/boxes/colony/vms/shill/containers/chatterbox.nix +++ b/nixos/boxes/colony/vms/shill/containers/chatterbox.nix @@ -36,7 +36,7 @@ }; firewall = { - tcp.allowed = [ 8008 ]; + tcp.allowed = [ 19999 8008 ]; }; }; @@ -45,6 +45,7 @@ }; services = { + netdata.enable = true; matrix-synapse = { enable = true; withJemalloc = true; diff --git a/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix b/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix index f42bac9..d2c9f64 100644 --- a/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix +++ b/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix @@ -86,13 +86,13 @@ in "netdata-colony.${lib.my.pubDomain}" = let - hosts = [ "vm" "fw" "ctr" "http" "jackflix-ctr" ]; + hosts = [ "vm" "fw" "ctr" "http" "jackflix-ctr" "chatterbox-ctr" ]; matchHosts = concatStringsSep "|" hosts; in mkMerge [ { locations = { - "= /".return = "301 https://$host/colony/"; + "= /".return = "301 https://$host/vm/"; "~ /(?${matchHosts})$".return = "301 https://$host/$behost/"; "~ /(?${matchHosts})/(?.*)" = mkMerge [ {