nginx error, committing to search the forgejo

This commit is contained in:
Jimbo 2025-01-01 13:50:43 -05:00
parent 77168ba9c7
commit a48cb3515b
8 changed files with 40 additions and 21 deletions

View file

@ -0,0 +1,10 @@
{ config, lib, pkgs, modulesPath, ... }:
{
boot = {
kernelPackages = pkgs.linuxPackages_hardened;
swraid = {
enable = true;
mdadmConf = "MAILADDR contact@${config.domains.p2}";
};
};
}

View file

@ -1,18 +1,22 @@
{ ... }:
{
imports = [
./disko
./boot
./firewall
./hardware
./users
../../modules/system
];
system.desktop.enable = false;
system.server.enable = true;
#system.lanzaboote.enable = true;
system.wireless.enable = false;
networking = {
hostName = "kitty";
hostId = "38ba3f57";
};
environment.sessionVariables.NIXOS_OZONE_WL = "1";
networking.hostName = "tower";
system = {
desktop.enable = false;
server.enable = true;
wireless.enable = false;
stateVersion = "24.05";
};
}

View file

@ -1,9 +1,6 @@
{ config, lib, pkgs, modulesPath, ... }:
{
boot = {
blacklistedKernelModules = [
"pcspkr"
];
initrd = {
availableKernelModules = [
"xhci_pci"
@ -18,10 +15,6 @@
"kvm-intel"
];
};
swraid = {
enable = true;
mdadmConf = "MAILADDR contact@${config.domains.jim2}";
};
};
# Main root
@ -89,7 +82,6 @@
};
};
swapDevices = [
{ device = "/dev/server/root/swap"; }
];

View file

@ -0,0 +1,4 @@
{ ... }:
{
imports = [ ./jimbo ];
}

View file

@ -0,0 +1,9 @@
{ lib, ... }:
{
home-manager.users.jimbo = {
home = {
desktop.enable = false;
stateVersion = lib.mkForce "24.05";
};
};
}

View file

@ -42,7 +42,7 @@ in {
};
# BlueMap webhost
nginx.virtualHosts."john.${config.domains.jim1}" = {
nginx.virtualHosts."john.${config.domains.p1}" = {
enableACME = true;
forceSSL = true;
locations."/" = {

View file

@ -11,19 +11,19 @@ in {
server-port = 30014;
motd = "\\u00A7l\\u00A7bJimbo's \\u00A7cRoguecraft \\u00A7bserver.";
require-resource-pack = true;
resource-pack = "https://${config.domains.jim1}/roguecraftresourcepackredir";
resource-pack = "https://${config.domains.p1}/roguecraftresourcepackredir";
resource-pack-sha1 = "b540c0562aba90c3ead2356bb9cb74fcf0db36b3";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks;
files = common.configFiles // {
"world/datapacks/roguecraft.zip" = builtins.fetchurl {
url = "https://${config.domains.jim1}/roguecraftdatapackredir";
url = "https://${config.domains.p1}/roguecraftdatapackredir";
sha256 = "04zrkvzvi1i898al45fh9j3k635sf9qhwca7phbv4ynkfl8bz3q3";
};
};
};
nginx.virtualHosts."${config.domains.jim1}".locations = {
nginx.virtualHosts."${config.domains.p1}".locations = {
"/roguecraftdatapackredir" = {
return = "301 https://cdn.modrinth.com/data/HtKjVijx/versions/Rme4c23R/Roguecraft%201.2.6%20-%20Data%20Pack.zip";
};

View file

@ -1,6 +1,6 @@
{ config, lib, ... }:
{
services.nginx.virtualHosts."torrent.${config.domains.p1}" = config.services.transmission.enable {
services.nginx.virtualHosts."torrent.${config.domains.p1}" = lib.mkIf config.services.transmission.enable {
enableACME = true;
forceSSL = true;
locations."/" = {