Skip to content

Commit

Permalink
packaging kindergarten again with nix
Browse files Browse the repository at this point in the history
  • Loading branch information
tanneberger committed Oct 14, 2023
1 parent 3e99190 commit db3e4b7
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 16 deletions.
48 changes: 36 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@
url = "github:tlm-solutions/datacare";
};

kindergarten = {
url = "github:tlm-solutions/kindergarten";
inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
};

telegram-decoder = {
url = "github:tlm-solutions/telegram-decoder";
inputs = {
Expand Down Expand Up @@ -106,6 +112,7 @@
, documentation-src
, funnel
, gnuradio-decoder
, kindergarten
, microvm
, nixpkgs
, sops-nix
Expand Down Expand Up @@ -135,6 +142,7 @@
{
nixpkgs.overlays = [
datacare.overlays.default
kindergarten.overlays.default
trekkie.overlays.default
lizard.overlays.default
bureaucrat.overlays.default
Expand Down Expand Up @@ -215,7 +223,7 @@
}
{
id = 8;
arch ="aarch64-linux";
arch = "aarch64-linux";
monitoring = false;
}
];
Expand Down
3 changes: 2 additions & 1 deletion modules/data-hoarder/chemo.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{ config, ... }:
let
service_number = 3;
in {
in
{
TLMS.chemo = {
enable = true;
host = "127.0.0.1";
Expand Down
2 changes: 1 addition & 1 deletion modules/data-hoarder/kindergarten.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
enableACME = true;
forceSSL = true;
locations."~ ^/(de|en)" = {
root = "/var/lib/kindergarten/";
root = if (config.deployment-TLMS.domain == "tlm.solutions") then "${pkgs.kindergarten}/bin/" else "${pkgs.kindergarten-staging}/bin/";
# index = "index.html";
tryFiles = "$uri /$1/index.html =404";
extraConfig = ''
Expand Down
2 changes: 1 addition & 1 deletion modules/data-hoarder/socket.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ in
port = 9000 + service_number;
};
metrics = {
port = 10010 + service_number ;
port = 10010 + service_number;
host = config.deployment-TLMS.net.wg.addr4;
};
};
Expand Down

0 comments on commit db3e4b7

Please sign in to comment.