Compare commits

..

No commits in common. "0d6653ed9bccf6e79321808db13bb0fdaeb667fd" and "f5c093493324ada46e38f538fe14980fc07ae8cb" have entirely different histories.

5 changed files with 2 additions and 11 deletions

View File

@ -27,7 +27,7 @@ in
ignoreCollisions = true; ignoreCollisions = true;
}; };
in "${pkgs.writeShellScriptBin "run.sh" '' in "${pkgs.writeShellScriptBin "run.sh" ''
${env}/bin/python ${pkgs.writeScript "pr-autobot.py" "${readFile ./pr-autobot.py}"} --private-key /var/lib/auto-pr-bot/private-key.pem --app-id 19565 --installation-id 407088 --repo nyanloutre/nixpkgs --cache-dir /var/cache/auto-pr-bot --version 19.09 ${env}/bin/python ${pkgs.writeScript "pr-autobot.py" "${readFile ./pr-autobot.py}"} --private-key /var/lib/auto-pr-bot/private-key.pem --app-id 19565 --installation-id 407088 --repo nyanloutre/nixpkgs --cache-dir /var/cache/auto-pr-bot --version 19.03
''}/bin/run.sh"; ''}/bin/run.sh";
}; };
}; };

View File

@ -83,7 +83,6 @@ in
internalInterfaces = [ "eno2" ]; internalInterfaces = [ "eno2" ];
forwardPorts = [ forwardPorts = [
{ destination = "10.30.0.1:22"; proto = "tcp"; sourcePort = 8443;} { destination = "10.30.0.1:22"; proto = "tcp"; sourcePort = 8443;}
{ destination = "10.30.135.35:25565"; proto = "tcp"; sourcePort = 25565; loopbackIPs=[ "195.36.180.44" ];}
]; ];
}; };
@ -110,7 +109,6 @@ in
machines = [ machines = [
{ ethernetAddress = "50:c7:bf:b6:b8:ef"; hostName = "HS110"; ipAddress = "10.30.50.7"; } { ethernetAddress = "50:c7:bf:b6:b8:ef"; hostName = "HS110"; ipAddress = "10.30.50.7"; }
{ ethernetAddress = "ac:1f:6b:4b:01:15"; hostName = "IPMI"; ipAddress = "10.30.1.1"; } { ethernetAddress = "ac:1f:6b:4b:01:15"; hostName = "IPMI"; ipAddress = "10.30.1.1"; }
{ ethernetAddress = "00:1f:c6:6e:d1:f1"; hostName = "minecraftos"; ipAddress = "10.30.135.35"; }
]; ];
extraConfig = '' extraConfig = ''
option domain-name-servers 89.234.141.66, 80.67.169.12, 80.67.169.40; option domain-name-servers 89.234.141.66, 80.67.169.12, 80.67.169.40;

View File

@ -142,11 +142,6 @@
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/var/lib/minecraft" =
{ device = "loutrepool/var/minecraft";
fsType = "zfs";
};
swapDevices = swapDevices =
[ [
{ {

View File

@ -211,7 +211,6 @@ in
exports = '' exports = ''
/mnt/medias 10.30.0.0/16(ro,no_root_squash) /mnt/medias 10.30.0.0/16(ro,no_root_squash)
/exports/steam 10.30.0.0/16(rw,async,no_root_squash) /exports/steam 10.30.0.0/16(rw,async,no_root_squash)
/var/lib/minecraft 10.30.0.0/16(rw,no_root_squash)
''; '';
statdPort = 4000; statdPort = 4000;
lockdPort = 4001; lockdPort = 4001;
@ -457,7 +456,7 @@ in
}; };
minecraft-server = { minecraft-server = {
enable = false; enable = true;
jvmOpts = "-Xms512m -Xmx3072m"; jvmOpts = "-Xms512m -Xmx3072m";
eula = true; eula = true;
declarative = true; declarative = true;

View File

@ -17,7 +17,6 @@
gitFull gitFull
tig tig
gitAndTools.hub gitAndTools.hub
quilt
# Gestion de paquets # Gestion de paquets
nix-prefetch-scripts nix-prefetch-scripts