From ae680f4096482145e7a0c8cf4b7a7c0d2a3175ac Mon Sep 17 00:00:00 2001 From: efim Date: Sun, 6 Aug 2023 14:54:17 +0000 Subject: [PATCH] debug stuff --- flake.nix | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/flake.nix b/flake.nix index 216dc4a..31f447e 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; - packageName = "blanning-poker-kazbegi"; + packageName = "planning-poker-kazbegi"; backendName = "${packageName}-backend"; version = "0.1.1"; backendPackage = sbt-derivation.lib.mkSbtDerivation rec { @@ -73,34 +73,34 @@ description = "Whether to use Nginx to proxy requests."; }; }; - config = lib.mkIf cfg.enable { - users.groups."${backendName}-group" = { }; - users.users."${backendName}-user" = { + config.users = lib.mkIf cfg.enable { + groups."${backendName}" = { }; + users."${backendName}-user" = { isSystemUser = true; - group = "${backendName}-group"; + group = "${backendName}"; }; - - systemd.services.${backendName} = + }; + config.systemd.services.${backendName} = lib.mkIf cfg.enable { + description = "Exercise app ${backendName}"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + startLimitIntervalSec = 30; + startLimitBurst = 10; + serviceConfig = let serverHost = if cfg.useNginx then "localhost" else cfg.host; in { - description = "Exercise app ${backendName}"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - startLimitIntervalSec = 30; - startLimitBurst = 10; - serviceConfig = { - ExecStart = - "${pkgs.jdk}/bin/java -jar ${backendPackage}/bin/${backendName}.jar -p ${ - toString cfg.port - } --host ${serverHost}"; - WorkingDirectory = "${backendPackage}/bin"; - Restart = "on-failure"; - User = "${backendName}-user"; - Group = "${backendName}-group"; - }; + ExecStart = + "${pkgs.jdk}/bin/java -jar ${backendPackage}/bin/${backendName}.jar -p ${ + toString cfg.port + } --host ${serverHost}"; + WorkingDirectory = "${backendPackage}/bin"; + Restart = "on-failure"; + User = "${backendName}-user"; + Group = "${backendName}"; }; - # this is only backend. Front end still configured and installed separately. - services.nginx.virtualHosts.${cfg.host}.locations."/api" = { + }; + config.services.nginx.virtualHosts.${cfg.host}.locations."/api" = + lib.mkIf cfg.enable { proxyPass = "http://127.0.0.1:${toString cfg.port}"; # this is config for websocket extraConfig = '' @@ -116,7 +116,6 @@ proxy_set_header Connection "upgrade"; ''; }; - }; }; }); # see https://serokell.io/blog/practical-nix-flakes