Catch all the stuff I missed in the server services to get them to build

This commit is contained in:
Jimbo 2024-10-15 17:46:44 -04:00
parent 25a3a7e237
commit a5f06865de
44 changed files with 212 additions and 197 deletions

View file

@ -1,7 +1,7 @@
{ inputs, ... }:
{ minecraft, ... }:
{
imports = [
inputs.minecraft.nixosModules.minecraft-servers
minecraft.nixosModules.minecraft-servers
./servers/velocity
./servers/dewdemolisher
./servers/johnside
@ -10,6 +10,8 @@
./servers/uberbeta
];
nixpkgs.overlays = [ minecraft.overlay ];
services.minecraft-servers = {
enable = true;
eula = true;

View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
let
common = import ../common.nix { inherit pkgs; };
common = import ../../common { inherit pkgs; };
in {
services.minecraft-servers.servers.blockworld = {
enable = true;

View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
let
common = import ../common.nix { inherit pkgs; };
common = import ../../common { inherit pkgs; };
in {
services.minecraft-servers.servers.dewdemolisher = {
enable = true;

View file

@ -1,6 +1,6 @@
{ pkgs, outputs, ... }:
{ pkgs, config, ... }:
let
common = import ../common.nix { inherit pkgs; };
common = import ../../common { inherit pkgs; };
in {
services = {
minecraft-servers.servers.johnside = {
@ -43,7 +43,7 @@ in {
};
# BlueMap webhost
nginx.virtualHosts."john.${outputs.secrets.jimDomain}" = {
nginx.virtualHosts."john.${config.secrets.jimDomain}" = {
enableACME = true;
forceSSL = true;
locations."/" = {

View file

@ -1,6 +1,6 @@
{ pkgs, outputs, ... }:
{ pkgs, config, ... }:
let
common = import ../common.nix { inherit pkgs; };
common = import ../../common { inherit pkgs; };
in {
services = {
minecraft-servers.servers.roguecraft = {
@ -12,19 +12,19 @@ in {
server-port = 30014;
motd = "\\u00A7l\\u00A7bJimbo's \\u00A7cRoguecraft \\u00A7bserver.";
require-resource-pack = true;
resource-pack = "https://${outputs.secrets.jimDomain}/roguecraftresourcepackredir";
resource-pack = "https://${config.secrets.jimDomain}/roguecraftresourcepackredir";
resource-pack-sha1 = "b540c0562aba90c3ead2356bb9cb74fcf0db36b3";
};
whitelist = common.whitelist;
symlinks = common.paperSymlinks;
files = common.configFiles // {
"world/datapacks/roguecraft.zip" = builtins.fetchurl {
url = "https://${outputs.secrets.jimDomain}/roguecraftdatapackredir";
url = "https://${config.secrets.jimDomain}/roguecraftdatapackredir";
sha256 = "04zrkvzvi1i898al45fh9j3k635sf9qhwca7phbv4ynkfl8bz3q3";
};
};
};
nginx.virtualHosts."${outputs.secrets.jimDomain}".locations = {
nginx.virtualHosts."${config.secrets.jimDomain}".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 @@
{ pkgs, ... }:
let
common = import ../common.nix { inherit pkgs; };
common = import ../../common { inherit pkgs; };
uberBukkitZip = pkgs.fetchzip {
url = "https://github.com/Moresteck/Project-Poseidon-Uberbukkit/releases/download/2.0.0/uberbukkit-2.0.0-java17.zip";
sha256 = "m4hgcqXJ43SnBGn6qNBGeEcXFv5Q8f/VFYJmx3aJ9PE=";

View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
let
common = import ../common.nix { inherit pkgs; };
common = import ../../common { inherit pkgs; };
in {
services.minecraft-servers.servers.velocity = {
enable = true;