diff --git a/systems/LoutreOS/hardware-configuration.nix b/systems/LoutreOS/hardware-configuration.nix index bc18a46..418346f 100644 --- a/systems/LoutreOS/hardware-configuration.nix +++ b/systems/LoutreOS/hardware-configuration.nix @@ -147,6 +147,11 @@ fsType = "zfs"; }; + fileSystems."/var/www" = + { device = "loutrepool/var/www"; + fsType = "zfs"; + }; + swapDevices = [ { diff --git a/systems/LoutreOS/monitoring.nix b/systems/LoutreOS/monitoring.nix index 4c5bcd2..599eded 100644 --- a/systems/LoutreOS/monitoring.nix +++ b/systems/LoutreOS/monitoring.nix @@ -32,6 +32,20 @@ in processes = {}; system = {}; disk = {}; + cgroup = [ + { + paths = [ + "/sys/fs/cgroup/memory/system.slice/*" + ]; + files = ["memory.*usage*" "memory.limit_in_bytes"]; + } + { + paths = [ + "/sys/fs/cgroup/cpu/system.slice/*" + ]; + files = ["cpuacct.usage" "cpu.cfs_period_us" "cpu.cfs_quota_us"]; + } + ]; ipmi_sensor = { path = "${pkgs.ipmitool}/bin/ipmitool"; }; smart = { path = "${pkgs.writeShellScriptBin "smartctl" "/run/wrappers/bin/sudo ${pkgs.smartmontools}/bin/smartctl $@"}/bin/smartctl"; @@ -55,7 +69,7 @@ in import json from subprocess import check_output - columns = ["NAME", "SIZE", "ALLOC", "FREE", "EXPANDSZ", "FRAG", "CAP", "DEDUP", "HEALTH", "ALTROOT"] + columns = ["NAME", "SIZE", "ALLOC", "FREE", "CKPOINT", "EXPANDSZ", "FRAG", "CAP", "DEDUP", "HEALTH", "ALTROOT"] health = {'ONLINE':0, 'DEGRADED':11, 'OFFLINE':21, 'UNAVAIL':22, 'FAULTED':23, 'REMOVED':24} stdout = check_output(["${pkgs.zfs}/bin/zpool", "list", "-Hp"],encoding='UTF-8').split('\n') diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index d86bc05..599a8c9 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -41,6 +41,7 @@ in "airsonic.${domaine}" = { ip = "127.0.0.1"; port = 4040; auth = false; }; "${domaine}" = { ip = "127.0.0.1"; port = nginxGetFirstLocalPort "wkd"; auth = false; }; "musique-meyenheim.fr" = { ip = "127.0.0.1"; port = nginxGetFirstLocalPort "musique-meyenheim.fr"; auth = false; }; + "minecraft.${domaine}" = { ip = "127.0.0.1"; port = nginxGetFirstLocalPort "minecraft-overviewer"; auth = false; }; }; }; @@ -57,6 +58,10 @@ in listen = [ { addr = "127.0.0.1"; port = 52351; } ]; locations = { "/" = { root = "/var/www/factorio"; }; }; }; + "minecraft-overviewer" = { + listen = [ { addr = "127.0.0.1"; port = 52354; } ]; + locations = { "/" = { root = "/var/www/minecraft-overviewer"; }; }; + }; "wkd" = { listen = [ { addr = "127.0.0.1"; port = 52352; } ]; locations = { "/.well-known/openpgpkey/" = {