lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'beefcake/beefcake-good2' into fix-api-lyte-dev

Browse source
This commit is contained in:
Daniel Flanagan 2024-02-21 22:04:34 -06:00
commit f2c0b533cf
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
nixos/beefcake.nix
View file

@ -11,6 +11,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
api-lyte-dev, api-lyte-dev,
# inputs, # inputs,
# outputs, # outputs,
# api-lyte-dev,
config, config,
pkgs, pkgs,
... ...
@ -25,6 +26,10 @@ in {
++ [ ++ [
# api-lyte-dev.nixosModules.api-lyte-dev # api-lyte-dev.nixosModules.api-lyte-dev
# nix-minecraft.nixosModules.minecraft-servers # nix-minecraft.nixosModules.minecraft-servers
api-lyte-dev.nixosModules.${system}.api-lyte-dev
# inputs.nix-minecraft.nixosModules.minecraft-servers
# inputs.nix-minecraft.nixosModules.minecraft-servers
]; ];
nixpkgs.overlays = [ nixpkgs.overlays = [
@ -61,17 +66,16 @@ in {
secretKeyFile = "/var/cache-priv-key.pem"; secretKeyFile = "/var/cache-priv-key.pem";
}; };
# services.api-lyte-dev = rec { services.api-lyte-dev = rec {
# enable = true; enable = true;
# port = 5757; port = 5757;
# stateDir = "/var/lib/api-lyte-dev"; stateDir = "/var/lib/api-lyte-dev";
# configFile = config.sops.secrets."api.lyte.dev".path; configFile = config.sops.secrets."api.lyte.dev".path;
# configFile = /dev/null; user = "api-lyte-dev";
# user = "api-lyte-dev"; group = user;
# group = user; };
# };
# systemd.services.api-lyte-dev.environment.LOG_LEVEL = "debug"; systemd.services.api-lyte-dev.environment.LOG_LEVEL = "debug";
sops = { sops = {
defaultSopsFile = ../secrets/beefcake/secrets.yml; defaultSopsFile = ../secrets/beefcake/secrets.yml;
@ -138,6 +142,12 @@ in {
# owner = config.services.nextcloud.serviceConfig.User; # owner = config.services.nextcloud.serviceConfig.User;
# group = config.services.nextcloud.serviceConfig.Group; # group = config.services.nextcloud.serviceConfig.Group;
# }; # };
nextcloud-admin-password = {
path = "/var/lib/nextcloud/admin-password";
mode = "0440";
# owner = config.services.nextcloud.serviceConfig.User;
# group = config.services.nextcloud.serviceConfig.Group;
};
}; };
}; };
@ -316,7 +326,7 @@ in {
} }
api.lyte.dev { api.lyte.dev {
reverse_proxy :$${toString config.services.api-lyte-dev.port} reverse_proxy :${toString config.services.api-lyte-dev.port}
} }
a.lyte.dev { a.lyte.dev {