adjusting nix module to changes in datacare
This commit is contained in:
parent
ca8a3c0e3d
commit
e9836213a4
|
@ -42,7 +42,7 @@
|
|||
datacare = {
|
||||
url = "github:tlm-solutions/datacare";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
#nixpkgs.follows = "nixpkgs";
|
||||
naersk.follows = "naersk";
|
||||
tlms-rs.follows = "tlms-rs";
|
||||
utils.follows = "flake-utils";
|
||||
|
@ -304,13 +304,13 @@
|
|||
echo -e "Service\t\tPort"
|
||||
echo -e "SSH:\t\t2223\troot:lol"
|
||||
echo -e "trekkie:\t${toString cfg.TLMS.trekkie.port}"
|
||||
echo -e "datacare:\t${toString cfg.TLMS.datacare.port}"
|
||||
echo -e "datacare:\t${toString cfg.TLMS.datacare.http.port}"
|
||||
echo -e "data-accumulator:\t${toString cfg.TLMS.dataAccumulator.port}"
|
||||
echo -e "funnel:\t${toString cfg.TLMS.funnel.defaultWebsocket.port}"
|
||||
echo
|
||||
|
||||
set -x
|
||||
export QEMU_NET_OPTS="hostfwd=tcp::2223-:22,hostfwd=tcp::80-:80,hostfwd=tcp::8050-:${toString cfg.TLMS.trekkie.port},hostfwd=tcp::8060-:${toString cfg.TLMS.datacare.port},hostfwd=tcp::8070-:${toString cfg.TLMS.dataAccumulator.port},hostfwd=tcp::8080-:${toString cfg.TLMS.funnel.defaultWebsocket.port}"
|
||||
export QEMU_NET_OPTS="hostfwd=tcp::2223-:22,hostfwd=tcp::80-:80,hostfwd=tcp::8050-:${toString cfg.TLMS.trekkie.port},hostfwd=tcp::8060-:${toString cfg.TLMS.datacare.http.port},hostfwd=tcp::8070-:${toString cfg.TLMS.dataAccumulator.port},hostfwd=tcp::8080-:${toString cfg.TLMS.funnel.defaultWebsocket.port}"
|
||||
echo "running the vm now..."
|
||||
${self.packages."x86_64-linux".fuck-microvm}/bin/run-staging-data-hoarder-vm
|
||||
'');
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
{ pkgs, config, lib, ... }: {
|
||||
deployment-TLMS.domain = lib.mkForce "local.tlm.solutions";
|
||||
deployment-TLMS.domain = lib.mkForce "local.tlm.solutions";
|
||||
}
|
||||
|
|
|
@ -5,5 +5,5 @@
|
|||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
|
||||
boot.initrd.kernelModules = [ "nvme" ];
|
||||
fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ in
|
|||
let
|
||||
wg-addr-pred = lib.assertMsg (!(isNull config.deployment-TLMS.net.wg.addr4)) "to add system to monitoring, add it to TLMS wireguard first!";
|
||||
in
|
||||
lib.mkIf (cfg.enable && wg-addr-pred) {
|
||||
lib.mkIf (cfg.enable && wg-addr-pred) {
|
||||
# prometheus node exporter
|
||||
services.prometheus.exporters = {
|
||||
node = {
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
{ config, ... }: {
|
||||
TLMS.datacare = {
|
||||
enable = true;
|
||||
host = "127.0.0.1";
|
||||
port = 8070;
|
||||
http = {
|
||||
host = "127.0.0.1";
|
||||
port = 8070;
|
||||
|
||||
};
|
||||
database = {
|
||||
host = "127.0.0.1";
|
||||
port = config.services.postgresql.port;
|
||||
|
@ -37,11 +40,11 @@
|
|||
enableACME = true;
|
||||
locations = {
|
||||
"/" = {
|
||||
proxyPass = with config.TLMS.datacare; "http://${host}:${toString port}/";
|
||||
proxyPass = with config.TLMS.datacare.http; "http://${host}:${toString port}/";
|
||||
proxyWebsockets = true;
|
||||
extraConfig = ''
|
||||
more_set_headers "Access-Control-Allow-Credentials: true";
|
||||
'';
|
||||
more_set_headers "Access-Control-Allow-Credentials: true";
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue