nix/nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed minecraft.

Browse Source
This commit is contained in:
root 2020-07-20 12:12:09 -05:00
parent 9f59ff30fe
commit 8217b5312d
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/fudo/minecraft-server.nix
View File

@ -43,6 +43,10 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [
cfg.package
];
services.minecraft-server = { services.minecraft-server = {
enable = true; enable = true;
package = cfg.package; package = cfg.package;

10
hosts/france.nix
View File

@ -270,8 +270,8 @@ in {
"webmail.test.fudo.org" = { "webmail.test.fudo.org" = {
title = "Fudo Webmail"; title = "Fudo Webmail";
favicon = "/etc/nixos/static/fudo.org/favicon.ico"; favicon = "/etc/nixos/static/fudo.org/favicon.ico";
mail-server = mail-hostname; mail-server = "mail.fudo.org";
domain = "test.fudo.org"; domain = "fudo.org";
edit-mode = "Plain"; edit-mode = "Plain";
database = { database = {
name = "webmail"; name = "webmail";
@ -284,8 +284,8 @@ in {
"webmail.test.selby.ca" = { "webmail.test.selby.ca" = {
title = "Selby Webmail"; title = "Selby Webmail";
favicon = "/etc/nixos/static/selby.ca/favicon.ico"; favicon = "/etc/nixos/static/selby.ca/favicon.ico";
mail-server = mail-hostname; mail-server = "mail.selby.ca";
domain = "test.selby.ca"; domain = "selby.ca";
database = { database = {
name = "webmail"; name = "webmail";
hostname = "localhost"; hostname = "localhost";
@ -621,7 +621,7 @@ in {
fudo.minecraft-server = { fudo.minecraft-server = {
enable = true; enable = true;
package = pkgs.minecraft-server_1_15_2; package = pkgs.minecraft-server_1_16_1;
data-dir = minecraft-data-dir; data-dir = minecraft-data-dir;
world-name = "selbyland"; world-name = "selbyland";
motd = "Welcome to the Selby Minecraft server."; motd = "Welcome to the Selby Minecraft server.";

13
packages/local.nix
View File

@ -23,6 +23,19 @@
}; };
}); });
# DON'T LEAVE THE HASH--Nix will think the package hasn't changed
minecraft-server_1_16_1 = let
version = "1.16.1";
url = "https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar";
sha256 = "0nwkdig6yw4cnm2ld78z4j4xzhbm1rwv55vfxz0gzhsbf93xb0i7";
in (pkgs.minecraft-server.overrideAttrs (oldAttrs: rec {
name = "minecraft-server-${version}";
inherit version;
src = pkgs.fetchurl {
inherit url sha256;
};
}));
postgresql_11_gssapi = pkgs.postgresql_11.overrideAttrs (oldAttrs: rec { postgresql_11_gssapi = pkgs.postgresql_11.overrideAttrs (oldAttrs: rec {
configureFlags = oldAttrs.configureFlags ++ [ "--with-gssapi" ]; configureFlags = oldAttrs.configureFlags ++ [ "--with-gssapi" ];
buildInputs = oldAttrs.buildInputs ++ [ pkgs.krb5 ]; buildInputs = oldAttrs.buildInputs ++ [ pkgs.krb5 ];