From 2c1225ff26a344476d4c99542a1b38cf054c6fd8 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Sun, 9 Jul 2023 02:51:04 +0200 Subject: update bahnhof.name --- chaski/services/bahnhof-name.nix | 17 +++++++++++------ flake.lock | 8 ++++---- pkgs/overlay.nix | 4 ++++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/chaski/services/bahnhof-name.nix b/chaski/services/bahnhof-name.nix index e0e2988..9c0b6e2 100644 --- a/chaski/services/bahnhof-name.nix +++ b/chaski/services/bahnhof-name.nix @@ -7,13 +7,18 @@ serviceConfig.Type = "simple"; path = [ pkgs.bahnhof-name ]; script = '' - bahnhofname + cd ${pkgs.bahnhof-name.outPath} + bin/bahnhofname ''; }; - services.nginx.virtualHosts."bahnhof.name" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://localhost:2345"; - }; + services.nginx.virtualHosts = + let vhost = { + enableACME = true; + forceSSL = true; + locations."/".proxyPass = "http://localhost:2345"; + }; in builtins.listToAttrs + (map (name: { inherit name; value = vhost; }) + ["bahnhof.name" "ril100.bahnhof.name" + "ds100.bahnhof.name" "leitpunkt.bahnhof.name"]); } diff --git a/flake.lock b/flake.lock index e3731b5..abe1afb 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "bahnhof-name": { "flake": false, "locked": { - "lastModified": 1683839400, - "narHash": "sha256-hfF6DmJIuFhg9E86OghYcsr/FuQW670Sv/CKxf56xXQ=", + "lastModified": 1688862544, + "narHash": "sha256-63AftRnapcbOomvAGK0+9ZpvrMNy1r7TgWBRfqi47Xs=", "ref": "refs/heads/main", - "rev": "59d807a2d7e1153086e00c129cdb9dbdac12263c", - "revCount": 4, + "rev": "b231e47108f60beb3ad781b2e1e70e233bc36ab9", + "revCount": 10, "type": "git", "url": "https://stuebinm.eu/git/bahnhof.name" }, diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index b3876d5..dd8dd5b 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -74,6 +74,10 @@ in version = "0.1"; pname = "bahnhof.name"; src = inputs.bahnhof-name; + + postInstall = '' + cp -r $src/data $out + ''; }; mu = oldstable.mu; -- cgit v1.2.3