darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request 'move-minecraft-to-oracle' (#17) from move-minecraft-to-oracle into main

Browse source 
Reviewed-on: #17
This commit is contained in:
Charlotte 🦝 Delenk 2023-04-17 16:38:20 +00:00
commit 8af806c3d8
Signed by: gitea-bot
GPG key ID: C9974EDF9932B558
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/instance-20221213-1915.nix
View file

@ -18,6 +18,7 @@
./services/chir.rs
./users/remote-build.nix
./services/atticd.nix
./services/minecraft.nix
];
boot.initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "usbhid"];

1
config/nixos-8gb-fsn1-1.nix
View file

@ -21,7 +21,6 @@
./services/postfixadmin.nix
./services/dovecot.nix
./services/postfix.nix
./services/minecraft.nix
./services/loki.nix
./services/reverse-proxy.nix
./services/matrix-media-repo.nix

5
config/services/minecraft.nix
View file

@ -12,6 +12,7 @@
services.minecraft = {
enable = true;
stateDir = "/persist/var/lib/minecraft";
whitelist = [
{
uuid = "74e2502d-64db-4ac4-bac7-a0a2bc50ec9f";
@ -26,7 +27,7 @@
name = "Hrothiwulfus";
}
];
properties.server-ip = "138.201.155.128"; # death
properties.server-ip = "130.162.60.127"; # death
paper-yml = {
world-settings.default = {
max-auto-save-chunks-per-tick = 8;
@ -227,7 +228,7 @@
extraConfig = ''
import baseConfig
reverse_proxy http://138.201.155.128:8123 {
reverse_proxy http://130.162.60.127:8123 {
trusted_proxies private_ranges
}
'';

2
modules/minecraft/server.nix
View file

@ -2532,7 +2532,7 @@ in {
User = "minecraft";
Group = "minecraft";
WorkingDirectory = cfg.stateDir;
ExecStart = "${papermc}/bin/minecraft-server -Xms1G -Xmx1G -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true";
ExecStart = "${papermc}/bin/minecraft-server -Xms8G -Xmx8G -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true";
Restart = "always";
RuntimeDirectory = "minecraft";
RuntimeDirectoryMode = "0755";

4
zones/chir.rs.nix
View file

@ -144,7 +144,7 @@ with dns.lib.combinators; let
SOA = {
nameServer = "ns1.chir.rs.";
adminEmail = "lotte@chir.rs";
serial = 27;
serial = 28;
};
NS = [
"ns1.chir.rs."
@ -224,7 +224,7 @@ with dns.lib.combinators; let
api = createZone {};
git = createZone {};
mail = createZone {};
mc = createZone {};
mc = createZone oracleBase;
ns1 = createZone {};
ns2 = createZone {};
ns3 = createZone oracleBase;