Merge pull request #71789 from tomfitzhenry/openarena-server

openarena: add module and test
This commit is contained in:
Aaron Andersen 2019-10-26 07:48:19 -04:00 committed by GitHub
commit 2921e8a82a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 106 additions and 0 deletions

View file

@ -6680,6 +6680,12 @@
githubId = 178444;
name = "Thomas Bereknyei";
};
tomfitzhenry = {
email = "tom@tom-fitzhenry.me.uk";
github = "tomfitzhenry";
githubId = 61303;
name = "Tom Fitzhenry";
};
tomsmeets = {
email = "tom.tsmeets@gmail.com";
github = "tomsmeets";

View file

@ -321,6 +321,7 @@
./services/games/factorio.nix
./services/games/minecraft-server.nix
./services/games/minetest-server.nix
./services/games/openarena.nix
./services/games/terraria.nix
./services/hardware/acpid.nix
./services/hardware/actkbd.nix

View file

@ -0,0 +1,56 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.openarena;
in
{
options = {
services.openarena = {
enable = mkEnableOption "OpenArena";
openPorts = mkOption {
type = types.bool;
default = false;
description = "Whether to open firewall ports for OpenArena";
};
extraFlags = mkOption {
type = types.listOf types.str;
default = [];
description = ''Extra flags to pass to <command>oa_ded</command>'';
example = [
"+set dedicated 2"
"+set sv_hostname 'My NixOS OpenArena Server'"
# Load a map. Mandatory for clients to be able to connect.
"+map oa_dm1"
];
};
};
};
config = mkIf cfg.enable {
networking.firewall = mkIf cfg.openPorts {
allowedUDPPorts = [ 27960 ];
};
systemd.services.openarena = {
description = "OpenArena";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
DynamicUser = true;
StateDirectory = "openarena";
ExecStart = "${pkgs.openarena}/bin/openarena-server +set fs_basepath ${pkgs.openarena}/openarena-0.8.8 +set fs_homepath /var/lib/openarena ${concatStringsSep " " cfg.extraFlags}";
Restart = "on-failure";
# Hardening
CapabilityBoundingSet = "";
NoNewPrivileges = true;
PrivateDevices = true;
};
};
};
}

View file

@ -202,6 +202,7 @@ in
novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {};
nsd = handleTest ./nsd.nix {};
nzbget = handleTest ./nzbget.nix {};
openarena = handleTest ./openarena.nix {};
openldap = handleTest ./openldap.nix {};
opensmtpd = handleTest ./opensmtpd.nix {};
openssh = handleTest ./openssh.nix {};

36
nixos/tests/openarena.nix Normal file
View file

@ -0,0 +1,36 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "openarena";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ tomfitzhenry ];
};
machine =
{ pkgs, ... }:
{ imports = [];
environment.systemPackages = with pkgs; [
socat
];
services.openarena = {
enable = true;
extraFlags = [
"+set dedicated 2"
"+set sv_hostname 'My NixOS server'"
"+map oa_dm1"
];
};
};
testScript =
''
$machine->waitForUnit("openarena.service");
$machine->waitUntilSucceeds("ss --numeric --udp --listening | grep -q 27960");
# The log line containing 'resolve address' is last and only message that occurs after
# the server starts accepting clients.
$machine->waitUntilSucceeds("journalctl -u openarena.service | grep 'resolve address: dpmaster.deathmask.net'");
# Check it's possible to join the server.
$machine->succeed("echo -n -e '\\xff\\xff\\xff\\xffgetchallenge' | socat - UDP4-DATAGRAM:127.0.0.1:27960 | grep -q challengeResponse");
'';
})

View file

@ -25,10 +25,16 @@ stdenv.mkDerivation {
patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.x86_64"
makeWrapper "${gameDir}/openarena.x86_64" "$out/bin/openarena" \
--prefix LD_LIBRARY_PATH : "${libPath}"
patchelf --set-interpreter "${interpreter}" "${gameDir}/oa_ded.x86_64"
makeWrapper "${gameDir}/oa_ded.x86_64" "$out/bin/openarena-server" \
--prefix LD_LIBRARY_PATH : "${libPath}"
'' else ''
patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.i386"
makeWrapper "${gameDir}/openarena.i386" "$out/bin/openarena" \
--prefix LD_LIBRARY_PATH : "${libPath}"
patchelf --set-interpreter "${interpreter}" "${gameDir}/oa_ded.i386"
makeWrapper "${gameDir}/oa_ded.i386" "$out/bin/openarena-server" \
--prefix LD_LIBRARY_PATH : "${libPath}"
''}
'';