Compare commits

..

No commits in common. "c659bff3f0773d94958b31c98887b72e56f91881" and "870381b16a201d2f89821aff24a76dc370803d9e" have entirely different histories.

3 changed files with 11 additions and 23 deletions

View File

@ -7,7 +7,7 @@ let
gamePath = "/var/lib/sdtdserver"; gamePath = "/var/lib/sdtdserver";
gameOptions = { gameOptions = {
ServerPort="26900"; ServerPort="26900";
ServerVisibility="2"; ServerIsPublic="true";
ServerName="Serveur des loutres"; ServerName="Serveur des loutres";
ServerPassword=""; ServerPassword="";
ServerMaxPlayerCount="16"; ServerMaxPlayerCount="16";
@ -17,18 +17,12 @@ let
ServerAdminSlotsPermission="0"; ServerAdminSlotsPermission="0";
ServerDescription="Un serveur idiot anti gilets jaunes"; ServerDescription="Un serveur idiot anti gilets jaunes";
ServerWebsiteURL=""; ServerWebsiteURL="";
ServerDisabledNetworkProtocols=""; ServerDisabledNetworkProtocols="UNET";
GameWorld="Navezgane"; GameWorld="Random Gen";
WorldGenSeed="Lakeu"; GameName="Loutre Game";
WorldGenSize="4096";
GameName="Lakeu";
GameDifficulty="2"; GameDifficulty="2";
GameMode="GameModeSurvival"; GameMode="GameModeSurvivalMP";
ZombiesRun="0"; ZombiesRun="0";
ZombieMove="0";
ZombieMoveNight="3";
ZombieFeralMove="3";
ZombieBMMove="3";
BuildCreate="false"; BuildCreate="false";
DayNightLength="60"; DayNightLength="60";
DayLightLength="18"; DayLightLength="18";
@ -42,9 +36,6 @@ let
TelnetEnabled="false"; TelnetEnabled="false";
TelnetPort="8081"; TelnetPort="8081";
TelnetPassword=""; TelnetPassword="";
TelnetFailedLoginLimit="10";
TelnetFailedLoginsBlocktime="10";
TerminalWindowEnabled="false";
AdminFileName="serveradmin.xml"; AdminFileName="serveradmin.xml";
DropOnDeath="0"; DropOnDeath="0";
DropOnQuit="0"; DropOnQuit="0";
@ -60,7 +51,6 @@ let
LandClaimDecayMode="0"; LandClaimDecayMode="0";
LandClaimOnlineDurabilityModifier="4"; LandClaimOnlineDurabilityModifier="4";
LandClaimOfflineDurabilityModifier="4"; LandClaimOfflineDurabilityModifier="4";
PartySharedKillRange="100";
AirDropFrequency="72"; AirDropFrequency="72";
AirDropMarker="false"; AirDropMarker="false";
MaxSpawnedZombies="60"; MaxSpawnedZombies="60";
@ -69,7 +59,6 @@ let
HideCommandExecutionLog="0"; HideCommandExecutionLog="0";
MaxUncoveredMapChunksPerPlayer="131072"; MaxUncoveredMapChunksPerPlayer="131072";
BedrollDeadZoneSize="15"; BedrollDeadZoneSize="15";
ServerLoginConfirmationText="Prout";
}; };
gameConfig = builtins.toFile "serverconfig.xml" '' gameConfig = builtins.toFile "serverconfig.xml" ''
<?xml version="1.0"?> <?xml version="1.0"?>
@ -103,10 +92,14 @@ in
]; ];
in '' in ''
${pkgs.steamcmd}/bin/steamcmd +login anonymous +force_install_dir ${gamePath} +app_update 294420 validate +quit ${pkgs.steamcmd}/bin/steamcmd +login anonymous +force_install_dir ${gamePath} +app_update 294420 validate +quit
${pkgs.patchelf}/bin/patchelf \
--set-interpreter "$(cat ${pkgs.gcc}/nix-support/dynamic-linker)" \
--set-rpath "${libPath}" \
${gamePath}/7DaysToDieServer.x86_64
install -m666 ${gameConfig} ${gamePath}/serverconfig.xml install -m666 ${gameConfig} ${gamePath}/serverconfig.xml
''; '';
script = '' script = ''
${pkgs.steam-run}/bin/steam-run ${gamePath}/7DaysToDieServer.x86_64 -quit -batchmode -nographics -dedicated -configfile=serverconfig.xml ${gamePath}/7DaysToDieServer.x86_64 -quit -batchmode -nographics -dedicated -configfile=serverconfig.xml
''; '';
}; };

View File

@ -5,7 +5,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
gitRev = "baee8283bb858602e6b8d9c4763f11f79d4ac813"; gitRev = "17d85e2162f7a65d8515626692d2ae55226d4680";
nixpkgs = fetchTarball "https://github.com/nyanloutre/nixpkgs/archive/${gitRev}.tar.gz"; nixpkgs = fetchTarball "https://github.com/nyanloutre/nixpkgs/archive/${gitRev}.tar.gz";
in in
{ {

View File

@ -112,11 +112,6 @@
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/var/lib/private/sdtdserver" =
{ device = "loutrepool/var/sdtdserver";
fsType = "zfs";
};
fileSystems."/var/dkim" = fileSystems."/var/dkim" =
{ device = "loutrepool/var/dkim"; { device = "loutrepool/var/dkim";
fsType = "zfs"; fsType = "zfs";