diff --git a/flake.lock b/flake.lock index c9a364d..442ffb2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1708463499, - "narHash": "sha256-GvqU+Z3cZkgMXf41vfMELLKPk+EVUl1UMW56Gz5ccrU=", + "lastModified": 1708573384, + "narHash": "sha256-l4MSfNXfPdY1hPtKwsAvqMuIhnjDqgmE2Bq6J8h5wyw=", "ref": "refs/heads/master", - "rev": "e3f0cae4f75101706bc8b9a822f7d90b03a91702", - "revCount": 80, + "rev": "4d7f82fe9b5d7d3881455577f7477049d1db130c", + "revCount": 81, "type": "git", "url": "ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git" }, diff --git a/nixos/beefcake.nix b/nixos/beefcake.nix index 21b4802..e355d5c 100644 --- a/nixos/beefcake.nix +++ b/nixos/beefcake.nix @@ -10,7 +10,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 { # inputs, # outputs, - # api-lyte-dev, + api-lyte-dev, config, pkgs, ... @@ -23,7 +23,7 @@ in { ../modules/nixos/fonts.nix ] ++ [ - # api-lyte-dev.nixosModules.api-lyte-dev + api-lyte-dev.nixosModules.api-lyte-dev # inputs.nix-minecraft.nixosModules.minecraft-servers ]; @@ -62,16 +62,16 @@ in { secretKeyFile = "/var/cache-priv-key.pem"; }; - # services.api-lyte-dev = rec { - # enable = true; - # port = 5757; - # stateDir = "/var/lib/api-lyte-dev"; - # configFile = config.sops.secrets."api.lyte.dev".path; - # user = "api-lyte-dev"; - # group = user; - # }; + services.api-lyte-dev = rec { + enable = true; + port = 5757; + stateDir = "/var/lib/api-lyte-dev"; + configFile = config.sops.secrets."api.lyte.dev".path; + user = "api-lyte-dev"; + group = user; + }; - # systemd.services.api-lyte-dev.environment.LOG_LEVEL = "debug"; + systemd.services.api-lyte-dev.environment.LOG_LEVEL = "debug"; sops = { defaultSopsFile = ../secrets/beefcake/secrets.yml; @@ -107,8 +107,8 @@ in { # path = "${config.services.api-lyte-dev.stateDir}/secrets.json"; # TODO: would be cool to assert that it's correctly-formatted JSON? probably should be done in a pre-commit hook? mode = "0440"; - # owner = config.services.api-lyte-dev.user; - # group = config.services.api-lyte-dev.group; + owner = config.services.api-lyte-dev.user; + group = config.services.api-lyte-dev.group; }; "jland.env" = { @@ -315,9 +315,9 @@ in { reverse_proxy :${toString config.services.vaultwarden.config.ROCKET_PORT} } - # api.lyte.dev { - # reverse_proxy :$${toString config.services.api-lyte-dev.port} - # } + api.lyte.dev { + reverse_proxy :${toString config.services.api-lyte-dev.port} + } a.lyte.dev { reverse_proxy :${toString config.services.plausible.server.port}