diff --git a/services/boardwise/default.nix b/services/boardwise/default.nix index db5dd9b..9bb37ac 100644 --- a/services/boardwise/default.nix +++ b/services/boardwise/default.nix @@ -1,7 +1,9 @@ { system, pkgs, lib, ... }: let - boardwise = builtins.getFlake - "github:boardwise-gg/website/0d5a66c604ba8c553d391c7461ff012d8b9c5393"; + boardwise = ( + builtins.getFlake "github:boardwise-gg/website/0d5a66c604ba8c553d391c7461ff012d8b9c5393" + ).packages.${system}.app; + coach-scraper = builtins.getFlake "github:boardwise-gg/coach-scraper/58815d3ae5a69cac12436a01e77019a5ac5d16a7"; in @@ -30,15 +32,19 @@ in systemd.services.boardwise = { enable = true; description = "BoardWise Server"; - after = [ "postgresql.service" ]; - requires = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "postgresql.service" ]; + requires = [ "network-online.target" "postgresql.service" ]; + environment = { + DATABASE_URL = "ecto://postgres:postgres@localhost/boardwise"; + }; serviceConfig = { - Environment = [ - "DATABASE_URL=ecto://postgres:postgres@localhost/boardwise" - ]; + Type = "exec"; EnvironmentFile = "/run/secrets/BOARDWISE_SECRET_KEY_BASE"; - ExecStartPre = "${boardwise.packages.${system}.app}/bin/migrate"; - ExecStart = "${boardwise.packages.${system}.app}/bin/boardwise start"; + ExecStartPre = "${boardwise}/bin/migrate"; + ExecStart = "${boardwise}/bin/boardwise start"; + ExecStop = "${boardwise}/bin/reconn stop"; + ExecReload = "${boardwise}/bin/reconn restart"; Restart = "on-failure"; }; }; diff --git a/services/reconn/default.nix b/services/reconn/default.nix index 7d57fa3..2d6b83e 100644 --- a/services/reconn/default.nix +++ b/services/reconn/default.nix @@ -1,7 +1,8 @@ { system, pkgs, lib, ... }: let - reconn-url = "git+https://git.jrpotter.com/r/reconn?rev=fa031b2507c625c54abca36fd3f86fc8338e8777"; - reconn = (builtins.getFlake reconn-url).packages.${system}.app; + reconn = ( + builtins.getFlake "git+https://git.jrpotter.com/r/reconn?rev=fa031b2507c625c54abca36fd3f86fc8338e8777" + ).packages.${system}.app; in { services = {