Add Blox
This commit is contained in:
parent
f13a7dc1ec
commit
c6249ebd82
3 changed files with 13 additions and 7 deletions
|
@ -8,6 +8,7 @@
|
||||||
config.domains = {
|
config.domains = {
|
||||||
p1 = "jimbosfiles.com";
|
p1 = "jimbosfiles.com";
|
||||||
p2 = "nixfox.ca";
|
p2 = "nixfox.ca";
|
||||||
|
blox = "bloxelcom.net";
|
||||||
corn = "freecorn1854.win";
|
corn = "freecorn1854.win";
|
||||||
luna = "lunamoonlight.xyz";
|
luna = "lunamoonlight.xyz";
|
||||||
};
|
};
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
mailserver = rec {
|
mailserver = rec {
|
||||||
enable = config.system.mailserver.enable;
|
enable = config.system.mailserver.enable;
|
||||||
domains = [
|
domains = [
|
||||||
"${config.domains.p1}"
|
|
||||||
"${config.domains.p2}"
|
"${config.domains.p2}"
|
||||||
|
"${config.domains.blox}"
|
||||||
"${config.domains.luna}"
|
"${config.domains.luna}"
|
||||||
"${config.domains.corn}"
|
"${config.domains.corn}"
|
||||||
];
|
];
|
||||||
|
@ -27,7 +27,6 @@
|
||||||
"jimbo@${config.domains.p2}" = {
|
"jimbo@${config.domains.p2}" = {
|
||||||
hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash;
|
hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash;
|
||||||
aliases = [
|
aliases = [
|
||||||
"jimbo@${config.domains.p1}"
|
|
||||||
"james@${config.domains.p2}"
|
"james@${config.domains.p2}"
|
||||||
"jimjam4real@${config.domains.p2}"
|
"jimjam4real@${config.domains.p2}"
|
||||||
|
|
||||||
|
@ -40,8 +39,14 @@
|
||||||
"contact@${config.domains.p2}"
|
"contact@${config.domains.p2}"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
"luna@${config.domains.luna}".hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
|
"luna@${config.domains.luna}" = {
|
||||||
"corn@${config.domains.corn}".hashedPasswordFile = pkgs.writeText "corn" config.secrets.cornMailHash;
|
hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
|
||||||
|
aliases = [ "luna@${config.domains.blox}" ];
|
||||||
|
};
|
||||||
|
"corn@${config.domains.corn}" = {
|
||||||
|
hashedPasswordFile = pkgs.writeText "corn" config.secrets.cornMailHash;
|
||||||
|
aliases = [ "corn@${config.domains.blox}" ];
|
||||||
|
};
|
||||||
"tiny@${config.domains.corn}".hashedPasswordFile = pkgs.writeText "tiny" config.secrets.tinyMailHash;
|
"tiny@${config.domains.corn}".hashedPasswordFile = pkgs.writeText "tiny" config.secrets.tinyMailHash;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -11,14 +11,14 @@ in {
|
||||||
server-port = 30014;
|
server-port = 30014;
|
||||||
motd = "\\u00A7l\\u00A7bNixFox \\u00A7cRoguecraft \\u00A7bserver.";
|
motd = "\\u00A7l\\u00A7bNixFox \\u00A7cRoguecraft \\u00A7bserver.";
|
||||||
require-resource-pack = true;
|
require-resource-pack = true;
|
||||||
resource-pack = "https://${config.domains.p1}/roguecraftresourcepackredir";
|
resource-pack = "https://${config.domains.p2}/roguecraftresourcepackredir";
|
||||||
resource-pack-sha1 = "b540c0562aba90c3ead2356bb9cb74fcf0db36b3";
|
resource-pack-sha1 = "b540c0562aba90c3ead2356bb9cb74fcf0db36b3";
|
||||||
};
|
};
|
||||||
whitelist = common.whitelist;
|
whitelist = common.whitelist;
|
||||||
symlinks = common.paperSymlinks;
|
symlinks = common.paperSymlinks;
|
||||||
files = common.configFiles // {
|
files = common.configFiles // {
|
||||||
"world/datapacks/roguecraft.zip" = builtins.fetchurl {
|
"world/datapacks/roguecraft.zip" = builtins.fetchurl {
|
||||||
url = "https://${config.domains.p1}/roguecraftdatapackredir";
|
url = "https://${config.domains.p2}/roguecraftdatapackredir";
|
||||||
sha256 = "04zrkvzvi1i898al45fh9j3k635sf9qhwca7phbv4ynkfl8bz3q3";
|
sha256 = "04zrkvzvi1i898al45fh9j3k635sf9qhwca7phbv4ynkfl8bz3q3";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -26,7 +26,7 @@ in {
|
||||||
|
|
||||||
ddclient.domains = lib.mkIf config.services.minecraft-servers.servers.roguecraft.enable [ "rogue.${config.domains.p2}" ];
|
ddclient.domains = lib.mkIf config.services.minecraft-servers.servers.roguecraft.enable [ "rogue.${config.domains.p2}" ];
|
||||||
|
|
||||||
nginx.virtualHosts."${config.domains.p1}".locations = lib.mkIf config.services.minecraft-servers.servers.roguecraft.enable {
|
nginx.virtualHosts."${config.domains.p2}".locations = lib.mkIf config.services.minecraft-servers.servers.roguecraft.enable {
|
||||||
"/roguecraftdatapackredir" = {
|
"/roguecraftdatapackredir" = {
|
||||||
return = "301 https://cdn.modrinth.com/data/HtKjVijx/versions/Rme4c23R/Roguecraft%201.2.6%20-%20Data%20Pack.zip";
|
return = "301 https://cdn.modrinth.com/data/HtKjVijx/versions/Rme4c23R/Roguecraft%201.2.6%20-%20Data%20Pack.zip";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue