From 49767d8198cb127f208994e8387dea0528bb4109 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 26 Nov 2018 17:23:58 +0100 Subject: [PATCH 1/4] update mail server --- services/mail-server.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/services/mail-server.nix b/services/mail-server.nix index 2c707b7..13fca17 100644 --- a/services/mail-server.nix +++ b/services/mail-server.nix @@ -17,8 +17,8 @@ in imports = [ (builtins.fetchTarball { - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/817d84d36d34616ecf1a6ed6cba4fb1327b3a74f/nixos-mailserver-817d84d36d34616ecf1a6ed6cba4fb1327b3a74f.tar.gz"; - sha256 = "0f7j61nlh4f3nqq3hbw0k4aq4mnmlp12cmkvyfwzrai92lpza4f9"; + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.2.0/nixos-mailserver-v2.2.0.tar.gz"; + sha256 = "0gqzgy50hgb5zmdjiffaqp277a68564vflfpjvk1gv6079zahksc"; }) ]; @@ -42,9 +42,6 @@ in certificateFile = "/var/lib/acme/${cfg.domaine}/fullchain.pem"; keyFile = "/var/lib/acme/${cfg.domaine}/key.pem"; - # Length of the Diffie Hillman prime used - dhParamBitLength = 4096; - # Enable IMAP and POP3 enableImap = true; enablePop3 = true; From 1026c2c5f9b7073b1470595f4dadc1faca865e39 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 26 Nov 2018 17:24:58 +0100 Subject: [PATCH 2/4] =?UTF-8?q?pr=20bas=C3=A9e=20sur=20non=20small?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/pr-autobot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/pr-autobot.py b/services/pr-autobot.py index 0d41877..a1ad4b1 100755 --- a/services/pr-autobot.py +++ b/services/pr-autobot.py @@ -13,7 +13,7 @@ parser.add_argument('--repo') parser.add_argument('--cache-dir') args = vars(parser.parse_args()) -channel_req = urllib.request.Request(url='https://nixos.org/channels/nixos-18.09-small/git-revision') +channel_req = urllib.request.Request(url='https://nixos.org/channels/nixos-18.09/git-revision') latest_commit = urllib.request.urlopen(channel_req).read().decode('utf-8') try: previous_commit = open(args['cache_dir'] + '/git-revision', 'r').read() From 2cd861a769c42faf56448deccb2fb12a9b434591 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 26 Nov 2018 17:25:26 +0100 Subject: [PATCH 3/4] =?UTF-8?q?mise=20=C3=A0=20jour=20syst=C3=A8me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- systems/LoutreOS/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index abd18ba..16c4014 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -5,7 +5,7 @@ { config, pkgs, ... }: let - gitRev = "b9c2a5800f8d42cedf0545663187597f73ca2b51"; + gitRev = "17d85e2162f7a65d8515626692d2ae55226d4680"; nixpkgs = fetchTarball "https://github.com/nyanloutre/nixpkgs/archive/${gitRev}.tar.gz"; in { @@ -53,8 +53,8 @@ in }; networking.firewall = { - allowedTCPPorts = [ ]; - allowedUDPPorts = [ ]; + allowedTCPPorts = [ ]; + allowedUDPPorts = [ ]; enable = true; }; From 1705d336086be696cf67419a17782323537e5803 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 26 Nov 2018 17:26:55 +0100 Subject: [PATCH 4/4] serveur 7 days to die --- services/sdtdserver.nix | 113 ++++++++++++++++++++++++++++++++++ systems/LoutreOS/services.nix | 3 + 2 files changed, 116 insertions(+) create mode 100644 services/sdtdserver.nix diff --git a/services/sdtdserver.nix b/services/sdtdserver.nix new file mode 100644 index 0000000..2e75443 --- /dev/null +++ b/services/sdtdserver.nix @@ -0,0 +1,113 @@ +{lib, config, pkgs, ... }: + +with lib; + +let + cfg = config.services.sdtdserver; + gamePath = "/var/lib/sdtdserver"; + gameOptions = { + ServerPort="26900"; + ServerIsPublic="true"; + ServerName="Serveur des loutres"; + ServerPassword=""; + ServerMaxPlayerCount="16"; + ServerReservedSlots="0"; + ServerReservedSlotsPermission="100"; + ServerAdminSlots="0"; + ServerAdminSlotsPermission="0"; + ServerDescription="Un serveur idiot anti gilets jaunes"; + ServerWebsiteURL=""; + ServerDisabledNetworkProtocols="UNET"; + GameWorld="Random Gen"; + GameName="Loutre Game"; + GameDifficulty="2"; + GameMode="GameModeSurvivalMP"; + ZombiesRun="0"; + BuildCreate="false"; + DayNightLength="60"; + DayLightLength="18"; + PlayerKillingMode="3"; + PersistentPlayerProfiles="false"; + PlayerSafeZoneLevel="5"; + PlayerSafeZoneHours="5"; + ControlPanelEnabled="false"; + ControlPanelPort="8080"; + ControlPanelPassword="CHANGEME"; + TelnetEnabled="false"; + TelnetPort="8081"; + TelnetPassword=""; + AdminFileName="serveradmin.xml"; + DropOnDeath="0"; + DropOnQuit="0"; + BloodMoonEnemyCount="8"; + EnemySpawnMode="true"; + EnemyDifficulty="0"; + BlockDurabilityModifier="100"; + LootAbundance="100"; + LootRespawnDays="30"; + LandClaimSize="41"; + LandClaimDeadZone="30"; + LandClaimExpiryTime="3"; + LandClaimDecayMode="0"; + LandClaimOnlineDurabilityModifier="4"; + LandClaimOfflineDurabilityModifier="4"; + AirDropFrequency="72"; + AirDropMarker="false"; + MaxSpawnedZombies="60"; + MaxSpawnedAnimals="50"; + EACEnabled="true"; + HideCommandExecutionLog="0"; + MaxUncoveredMapChunksPerPlayer="131072"; + BedrollDeadZoneSize="15"; + }; + gameConfig = builtins.toFile "serverconfig.xml" '' + + + ${concatStrings ( + mapAttrsToList (name: value: + " \n" + ) gameOptions)} + + ''; +in +{ + options.services.sdtdserver = { + enable = mkEnableOption "Activation du serveur dédié 7 Days to Die"; + }; + + config = mkIf cfg.enable { + + systemd.services.sdtdserver = { + description = "Serveur dédié 7 Days to Die"; + requires = ["network-online.target"]; + wantedBy = ["multi-user.target"]; + environment = { HOME = gamePath; }; + serviceConfig = { + DynamicUser = true; + StateDirectory = "sdtdserver"; + }; + preStart = let + libPath = with pkgs; lib.makeLibraryPath [ + stdenv.cc.cc.lib + ]; + in '' + ${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 + ''; + script = '' + ${gamePath}/7DaysToDieServer.x86_64 -quit -batchmode -nographics -dedicated -configfile=serverconfig.xml + ''; + }; + + networking.firewall = { + allowedTCPPorts = [ 26900 ]; + allowedUDPPorts = [ 26900 26901 26902 ]; + }; + + }; + +} diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index 3a26b77..f246a1e 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -19,6 +19,7 @@ in ../../services/site-max.nix ../../services/auto-pr.nix ../../services/python-ci.nix + ../../services/sdtdserver.nix ../../containers/vsftpd.nix ]; @@ -360,6 +361,8 @@ in auto-pr.enable = true; python-ci.enable = true; + + sdtdserver.enable = true; }; /*