Compare commits
No commits in common. "86fea7e3f6f5c952ece8b413d6e15a03f9f5ad22" and "1427322ab71aff2617b1c374505346eca057d79c" have entirely different histories.
86fea7e3f6
...
1427322ab7
|
@ -131,7 +131,6 @@
|
||||||
allowedUDPPorts = [
|
allowedUDPPorts = [
|
||||||
80
|
80
|
||||||
443
|
443
|
||||||
25565
|
|
||||||
config.services.tailscale.port
|
config.services.tailscale.port
|
||||||
#config.services.headscale.port
|
#config.services.headscale.port
|
||||||
];
|
];
|
||||||
|
|
|
@ -39,27 +39,7 @@
|
||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
proxyPass = "http://100.84.215.84:8096";
|
proxyPass = "http://100.84.215.84:8096";
|
||||||
};
|
};
|
||||||
|
#basicAuthFile = config.sops.secrets."nginx/defaultpass".path;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
virtualHosts."minecraft.256.no" = {
|
|
||||||
locations."/" = {
|
|
||||||
proxyWebsockets = true;
|
|
||||||
proxyPass = "http://100.84.215.84:25565";
|
|
||||||
extraConfig = ''
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
|
@ -19,7 +19,6 @@
|
||||||
|
|
||||||
../../services/smb.nix
|
../../services/smb.nix
|
||||||
../../services/torrent.nix
|
../../services/torrent.nix
|
||||||
../../services/mc.nix
|
|
||||||
#../../services/stableDiffusion.nix
|
#../../services/stableDiffusion.nix
|
||||||
#../../services/freshrrs.nix
|
#../../services/freshrrs.nix
|
||||||
];
|
];
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
domain = "${config.networking.domain}";
|
domain = "${config.networking.domain}";
|
||||||
extraDomainNames = [
|
extraDomainNames = [
|
||||||
"*.${config.networking.domain}"
|
"*.${config.networking.domain}"
|
||||||
#"lb0fj.eu"
|
"lb0fj.eu"
|
||||||
#"*.lb0fj.eu"
|
"*.lb0fj.eu"
|
||||||
"256.no"
|
"256.no"
|
||||||
"*.256.no"
|
"*.256.no"
|
||||||
"*.addictedmaker.eu"
|
"*.addictedmaker.eu"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
pkgs.freshrss
|
pkgs.freshrss
|
||||||
];
|
];
|
||||||
services.freshrss.enable = true;
|
services.freshrss.enable = true;
|
||||||
services.freshrss.baseUrl = "http://0.0.0.1";
|
services.freshrss.baseUrl = "http://127.0.0.1";
|
||||||
services.freshrss.passwordFile = config.sops.secrets."freshrss".path; #"/run/secrets/freshrss";
|
services.freshrss.passwordFile = config.sops.secrets."freshrss".path; #"/run/secrets/freshrss";
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,23 +0,0 @@
|
||||||
{ config, pkgs, lib, ... }:
|
|
||||||
{
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.ollama
|
|
||||||
];
|
|
||||||
|
|
||||||
services.minecraft-server = {
|
|
||||||
enable = true;
|
|
||||||
eula = true;
|
|
||||||
#jvmOpts = "-Xms4092M -Xmx4092M -XX:+UseG1GC -XX:+CMSIncrementalPacing -XX:+CMSClassUnloadingEnabled -XX:ParallelGCThreads=2 -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10";
|
|
||||||
|
|
||||||
|
|
||||||
# serverProperties = {
|
|
||||||
# server-port = 25500;
|
|
||||||
# difficulty = 3;
|
|
||||||
# gamemode = 1;
|
|
||||||
# max-players = 8;
|
|
||||||
# motd = "Adrian Minecraft server!";
|
|
||||||
# };
|
|
||||||
openFirewall = true;
|
|
||||||
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Reference in New Issue