minecraft: update to modpack 1.0.5 and add map.thewizard.link to caddy

This commit is contained in:
Alexandre Cavalheiro 2024-08-19 20:34:51 -03:00
parent 893aab43b8
commit 9d1256ada0
Signed by: wizardlink
GPG key ID: A5767B54367CFBDF
2 changed files with 9 additions and 6 deletions

View file

@ -26,6 +26,9 @@
} }
''; '';
virtualHosts."map.thewizard.link".extraConfig = ''
reverse_proxy 192.168.0.100:8123
'';
virtualHosts."git.thewizard.link".extraConfig = '' virtualHosts."git.thewizard.link".extraConfig = ''
reverse_proxy 127.0.0.1:3788 reverse_proxy 127.0.0.1:3788

View file

@ -2,8 +2,8 @@
let let
modpack = pkgs.fetchPackwizModpack { modpack = pkgs.fetchPackwizModpack {
url = "http://files.thewizard.link/horror/pack.toml"; url = "http://files.thewizard.link/minecraft/pack.toml";
packHash = "sha256-Huqdl1nGMJC/hvkK8HKxOMHectFioY7zaNeT+D6Ur/8="; packHash = "sha256-oBCLVNLaBwF7Nv1PMEzNmzSv6khcRIOLfOX9chZPI+Y=";
}; };
in in
{ {
@ -19,19 +19,19 @@ in
openFirewall = true; openFirewall = true;
servers = { servers = {
horror = { silly-pack = {
enable = true; enable = true;
package = pkgs.fabricServers.fabric-1_20_6; package = pkgs.fabricServers.fabric-1_20_1.override { loaderVersion = "0.15.11"; };
autoStart = true; autoStart = true;
jvmOpts = "-Xms512M -Xmx8192M"; jvmOpts = "-Xms512M -Xmx10112M -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:MaxGCPauseMillis=50 -XX:G1HeapRegionSize=4M -XX:TargetSurvivorRatio=90 -XX:G1NewSizePercent=50 -XX:G1MaxNewSizePercent=80 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1MixedGCLiveThresholdPercent=50";
serverProperties = { serverProperties = {
allow-flight = true; allow-flight = true;
difficulty = "normal"; difficulty = "normal";
enforce-secure-profile = true; enforce-secure-profile = true;
level-name = "horror"; level-name = "horror";
motd = "\\u00A70Are you a hero?\\u00A7r"; motd = "\\u00A70Ready to run?\\u00A7r";
pvp = true; pvp = true;
resource-pack = "https://cdn.modrinth.com/data/p1WH6sHr/versions/3lQn31SZ/From-The-Fog-1.20.5-1.20.6-v1.9.3-Data-Resource-Pack.zip"; resource-pack = "https://cdn.modrinth.com/data/p1WH6sHr/versions/3lQn31SZ/From-The-Fog-1.20.5-1.20.6-v1.9.3-Data-Resource-Pack.zip";
server-ip = "192.168.0.100"; server-ip = "192.168.0.100";