nixos/terraria: allow dataDir to be configured #89033

evanjs · 2020-05-27T16:48:38Z

Motivation for this change

add dataDir option to terraria module

This was requested on IRC, and since the minecraft module has a dataDir option, I figured this would be appropriate for the terraria module as well.

To test this, I used a basic configuration with nixos-generators

configuration.nix

{ config, lib, pkgs, ... }:
{
  services.sshd.enable = true;
  services.terraria = {
    enable = true;
    dataDir = "/srv/terraria";
  };
  nixpkgs.config.allowUnfree = true;

  networking.firewall.allowedTCPPorts = [ 80 ];
  
  users.users.root.password = "nixos";
  services.openssh.permitRootLogin = lib.mkDefault "yes";
  #services.mingetty.autologinUser = lib.mkDefault "root";
}

I built the image with ./nixos-generate -c configuration.nix -f vm-nogui --run -I nixpkgs=/home/evanjs/src/nixpkgs (against a local nixpkgs with my changes)

The vm launches and the terraria service is activated as expected.

systemctl status terraria

[root@nixos:~]# systemctl status terraria
● terraria.service - Terraria Server Service
     Loaded: loaded (/nix/store/73rrg3mkc1c4wk5fndlb1x4jlhyml76c-unit-terraria.service/terraria.service; enabled; vendor preset: enabled)
     Active: active (running) since Wed 2020-05-27 16:28:01 UTC; 32s ago
    Process: 729 ExecStart=/nix/store/h72ypgl2sg7p57fj3y2iac6ksvxi3haw-tmux-3.1b/bin/tmux -S /srv/terraria/terraria.sock new -d /nix/store/55h0lqna1fyp4j4sgi0m4zydkqdfigp8-terraria-server-1.4.0.4/bin/TerrariaServer -port 7777 -maxPlayers >
    Process: 737 ExecStartPost=/nix/store/nfirs0yp8vzvg43wg81xym85hqmndhfc-unit-script-terraria-post-start/bin/terraria-post-start (code=exited, status=0/SUCCESS)
   Main PID: 735 (tmux: server)
         IP: 0B in, 0B out
      Tasks: 4 (limit: 411)
     Memory: 267.1M
        CPU: 1.730s
     CGroup: /system.slice/terraria.service
             ├─735 /nix/store/h72ypgl2sg7p57fj3y2iac6ksvxi3haw-tmux-3.1b/bin/tmux -S /srv/terraria/terraria.sock new -d /nix/store/55h0lqna1fyp4j4sgi0m4zydkqdfigp8-terraria-server-1.4.0.4/bin/TerrariaServer -port 7777 -maxPlayers 255 -aut>
             └─736 /nix/store/55h0lqna1fyp4j4sgi0m4zydkqdfigp8-terraria-server-1.4.0.4/bin/TerrariaServer -port 7777 -maxPlayers 255 -autocreate 2

May 27 16:28:01 nixos systemd[1]: Starting Terraria Server Service...
May 27 16:28:01 nixos systemd[1]: Started Terraria Server Service.

terraria.sock, the only variable (that I can see) that is affected by the location of the home option is also present.

[root@nixos:~]# ls /srv/terraria/
terraria.sock

add dataDir option to terraria module

nixos/modules/services/games/terraria.nix

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>

## Motivation Dependencies should be up to date. ## Changelog for unstable: Commits: [NixOS/nixpkgs@c59ea8b8...a3173612](NixOS/nixpkgs@c59ea8b...a317361) * [`9a21fc26`](NixOS/nixpkgs@9a21fc2) lightburn: 0.9.15 -> 0.9.16 * [`813be97d`](NixOS/nixpkgs@813be97) lyra: 1.4 -> 1.5.1 * [`f36c47f2`](NixOS/nixpkgs@f36c47f) miller: 5.9.0 -> 5.9.1 * [`4441733e`](NixOS/nixpkgs@4441733) minikube: 1.12.3 -> 1.13.0 * [`5664601f`](NixOS/nixpkgs@5664601) ocamlPackages.fdkaac: init at 0.3.2 * [`0a8c2f8c`](NixOS/nixpkgs@0a8c2f8) nushell: 0.18.1 -> 0.19.0 * [`5811b6c1`](NixOS/nixpkgs@5811b6c) chromiumDev: 86.0.4238.0 -> 86.0.4240.8 * [`bd9c787d`](NixOS/nixpkgs@bd9c787) openlibm: 0.7.0 -> 0.7.1 * [`de69b705`](NixOS/nixpkgs@de69b70) chromium: replace update.nix with Python impl * [`5da66561`](NixOS/nixpkgs@5da6656) chromiumDev: 86.0.4240.8 -> 87.0.4252.0 * [`6c92847e`](NixOS/nixpkgs@6c92847) chromiumBeta: 85.0.4183.83 -> 86.0.4240.22 * [`611258f0`](NixOS/nixpkgs@611258f) document nix-env bug relating to multiple output installation * [`e6f4f3a3`](NixOS/nixpkgs@e6f4f3a) maintainers: add j0hax * [`452e5b93`](NixOS/nixpkgs@452e5b9) octoprint.python.pkgs.displaylayerprogress: init at 1.23.2 * [`4746456a`](NixOS/nixpkgs@4746456) octoprint.python.pkgs.octoprint-dashboard: init at 1.13.0 * [`c7a503bf`](NixOS/nixpkgs@c7a503b) Revert "chromiumDev: 86.0.4240.8 -> 87.0.4252.0" * [`717d3779`](NixOS/nixpkgs@717d377) oppai-ng: 3.2.3 -> 3.3.0 * [`c763b498`](NixOS/nixpkgs@c763b49) mdcat: 0.20.0 -> 0.21.1 * [`0cf63fde`](NixOS/nixpkgs@0cf63fd) deno: 1.3.2 -> 1.3.3 * [`2e91a108`](NixOS/nixpkgs@2e91a10) osu-lazer: 2020.820.0 -> 2020.903.0 * [`1c368b0f`](NixOS/nixpkgs@1c368b0) picard-tools: 2.23.3 -> 2.23.4 * [`98d6b55f`](NixOS/nixpkgs@98d6b55) nixos/testing: remove remaining coverage-data logic * [`86a1a0a6`](NixOS/nixpkgs@86a1a0a) mautrix-whatsapp: 0.1.3 -> 0.1.4 * [`2f4c7093`](NixOS/nixpkgs@2f4c709) gitea: 1.12.3 -> 1.12.4 * [`4e21edf9`](NixOS/nixpkgs@4e21edf) pspg: 3.1.2 -> 3.1.3 * [`33b860ec`](NixOS/nixpkgs@33b860e) tiledb: 1.7.7 -> 2.0.7 * [`f4753023`](NixOS/nixpkgs@f475302) rink: 0.5.0 -> 0.5.1 * [`bfa4aa15`](NixOS/nixpkgs@bfa4aa1) rssguard: 3.7.0 -> 3.7.2 * [`438d5b6b`](NixOS/nixpkgs@438d5b6) pythonPackages.tiledb: 0.5.6 -> 0.6.6 * [`6eea6447`](NixOS/nixpkgs@6eea644) nixos/tests/installer swraid: increase partition size * [`1649ef9e`](NixOS/nixpkgs@1649ef9) sensu-go-backend: 5.21.1 -> 5.21.2 * [`e5b09183`](NixOS/nixpkgs@e5b0918) iso-flags: init at unstable-18012020 * [`430fe6c7`](NixOS/nixpkgs@430fe6c) cinnamon: add iso-flag* packages like in upstream * [`ad59f20d`](NixOS/nixpkgs@ad59f20) cinnamon.cinnamon-screensaver: init at 4.4.0 * [`302c8a46`](NixOS/nixpkgs@302c8a4) cinnamon.cinnamon-common: init at 4.4.1 * [`ce2895da`](NixOS/nixpkgs@ce2895d) cinnamon.cinnamon-common.libcroco: init at 0.6.13 * [`0555dc1c`](NixOS/nixpkgs@0555dc1) shattered-pixel-dungeon: 0.8.2b -> 0.8.2d * [`f7127a35`](NixOS/nixpkgs@f7127a3) sickgear: 0.21.36 -> 0.21.42 * [`1b197ce0`](NixOS/nixpkgs@1b197ce) wineUnstable: 5.14 -> 5.15 * [`e049f91e`](NixOS/nixpkgs@e049f91) wineUnstable: 5.15 -> 5.16 * [`bf9112cd`](NixOS/nixpkgs@bf9112c) skaffold: 1.13.2 -> 1.14.0 * [`cc797c4a`](NixOS/nixpkgs@cc797c4) star: 2.7.4a -> 2.7.5c * [`f30e80ba`](NixOS/nixpkgs@f30e80b) hackage-packages.nix: fix eval pandoc_2_10_1 on hydra * [`edeece0a`](NixOS/nixpkgs@edeece0) libpqxx: enable for darwin * [`436b3a43`](NixOS/nixpkgs@436b3a4) terraform-ls: 0.6.1 -> 0.7.0 * [`a133475d`](NixOS/nixpkgs@a133475) linux_zen: 5.8.1 -> 5.8.7 * [`7a0eb473`](NixOS/nixpkgs@7a0eb47) gitkraken: 7.2.0 -> 7.3.0 * [`d977d765`](NixOS/nixpkgs@d977d76) postman: 7.30.1 -> 7.31.1 * [`854a229a`](NixOS/nixpkgs@854a229) nixos/terraria: allow dataDir to be configured (NixOS/nixpkgs#89033) * [`6668937f`](NixOS/nixpkgs@6668937) nushell: enable for aarch64 * [`9323a3f3`](NixOS/nixpkgs@9323a3f) appimageTools: use buildFHSUserEnvBubblewrap * [`328e30e1`](NixOS/nixpkgs@328e30e) zigbee2mqtt: 1.14.3 -> 1.14.4 * [`22a9d9aa`](NixOS/nixpkgs@22a9d9a) tiledb: enable for all unix, add tweaks for darwin & non-x86 systems * [`ac05da41`](NixOS/nixpkgs@ac05da4) pantheon.elementary-dock: fix double includedir in .pc * [`bc57f6d2`](NixOS/nixpkgs@bc57f6d) sndio: 1.6.0 -> 1.7.0 * [`96bd235e`](NixOS/nixpkgs@96bd235) sndio: fix up for Darwin * [`fdefec4f`](NixOS/nixpkgs@fdefec4) vcsi: init at 7.0.12 * [`34b5c5c1`](NixOS/nixpkgs@34b5c5c) nixos/acme: More features and fixes * [`f0cb5c6a`](NixOS/nixpkgs@f0cb5c6) Revert "nixos/fontconfig: fix 50-user.conf handling" * [`92e990a8`](NixOS/nixpkgs@92e990a) vimPlugins: Inherit meta from node plugins * [`de3a4a05`](NixOS/nixpkgs@de3a4a0) pdfcpu: 0.3.4 -> 0.3.5 * [`82eb3cd4`](NixOS/nixpkgs@82eb3cd) ocamlPackages.srt: init at 0.1.1 * [`e2d02e46`](NixOS/nixpkgs@e2d02e4) youtube-dl: 2020.07.28 -> 2020.09.06 * [`44f439fc`](NixOS/nixpkgs@44f439f) atlassian-jira: 8.10.0 -> 8.12.0 * [`abedb5c4`](NixOS/nixpkgs@abedb5c) Move KnightOS packages into folder * [`b23940e5`](NixOS/nixpkgs@b23940e) texinfo: revert to version 6.5 on Darwin * [`1488e7d1`](NixOS/nixpkgs@1488e7d) tbb: fix library install name on macOS * [`5998a16b`](NixOS/nixpkgs@5998a16) epson-escpr2: 1.1.15 -> 1.1.17 * [`6a0149df`](NixOS/nixpkgs@6a0149d) vorta: 0.6.26 -> 0.7.0 * [`fd5f28af`](NixOS/nixpkgs@fd5f28a) vgrep: init at 2.4.0 * [`e60ff5a3`](NixOS/nixpkgs@e60ff5a) python3Packages.libarcus: 4.6.1 -> 4.7.1 * [`497ff43d`](NixOS/nixpkgs@497ff43) python3Packages.libsavitar: 4.6.1 -> 4.7.1 * [`daa77cc7`](NixOS/nixpkgs@daa77cc) python3Packages.uranium: 4.6.1 -> 4.7.1 * [`7a0ef553`](NixOS/nixpkgs@7a0ef55) curaengine: 4.6.1 -> 4.7.1 * [`6b4f9a16`](NixOS/nixpkgs@6b4f9a1) cura: 4.6.1 -> 4.7.1 * [`6841659b`](NixOS/nixpkgs@6841659) curaPlugins.octoprint: 3.5.12 -> 3.5.16 * [`dadab534`](NixOS/nixpkgs@dadab53) yafaray-core: 3.4.4 -> 3.5.0 * [`a3bcf4f7`](NixOS/nixpkgs@a3bcf4f) tippecanoe: 1.35.0 -> 1.36.0 * [`e523a709`](NixOS/nixpkgs@e523a70) yafaray-core: restrict to x86_64-linux * [`2927a19b`](NixOS/nixpkgs@2927a19) chromium: Unblock nixos-unstable by using the correct argument to fetchurl * [`9df09227`](NixOS/nixpkgs@9df0922) marwaita: 7.5.1 -> 7.6.1 * [`50285e24`](NixOS/nixpkgs@50285e2) fractal: add gtk support to gstreamer * [`ebd2e632`](NixOS/nixpkgs@ebd2e63) gns3-{gui,server}: 2.2.12 -> 2.2.13 * [`08eb704b`](NixOS/nixpkgs@08eb704) utils.bash: revert NixOS/nixpkgs#93560 for darwin, unblocks channels * [`92cff610`](NixOS/nixpkgs@92cff61) pgformatter: 4.3 -> 4.4 (NixOS/nixpkgs#96920) * [`1876163f`](NixOS/nixpkgs@1876163) bazel-kazel: 0.0.12 -> 0.1.0 (NixOS/nixpkgs#97074) * [`f06b103e`](NixOS/nixpkgs@f06b103) eventstat: 0.04.09 -> 0.04.10 * [`2c58c24e`](NixOS/nixpkgs@2c58c24) wimlib: 1.13.1 -> 1.13.2 * [`6c2059b3`](NixOS/nixpkgs@6c2059b) qwt6_qt4: 6.1.4 -> 6.1.5 * [`f151fd87`](NixOS/nixpkgs@f151fd8) sysvinit: 2.96 -> 2.97 * [`1311343c`](NixOS/nixpkgs@1311343) fx_cast_bridge: 0.0.6 -> 0.0.7 * [`c39f775f`](NixOS/nixpkgs@c39f775) icingaweb2: 2.8.0 -> 2.8.1 * [`cd435ce7`](NixOS/nixpkgs@cd435ce) opencl-clhpp: 2.0.11 -> 2.0.12 * [`a5121f73`](NixOS/nixpkgs@a5121f7) catch2: 2.12.2 -> 2.12.3 * [`d4f6c94d`](NixOS/nixpkgs@d4f6c94) ocamlPackages.labltk: init at 8.06.9 for OCaml 4.11 * [`7dce8e21`](NixOS/nixpkgs@7dce8e2) python27Packages.pydub: 0.24.0 -> 0.24.1 * [`e6cbcc2a`](NixOS/nixpkgs@e6cbcc2) python3Packages.scapy: 2.4.3 -> 2.4.4 (NixOS/nixpkgs#97215) * [`02590c96`](NixOS/nixpkgs@02590c9) nixos/qemu-vm: support nix run * [`a8d6e4b7`](NixOS/nixpkgs@a8d6e4b) hping: 20051105 -> 2014-12-26 (NixOS/nixpkgs#94683) * [`1835fc45`](NixOS/nixpkgs@1835fc4) services.openssh: add banner * [`cac53395`](NixOS/nixpkgs@cac5339) nixos/doc/borgbackup: correct install instructions for `vorta` * [`0f099965`](NixOS/nixpkgs@0f09996) keepalived: 2.0.20 -> 2.1.3 * [`e976a70f`](NixOS/nixpkgs@e976a70) awscli2: 2.0.36 -> 2.0.46 (NixOS/nixpkgs#97304) * [`22e61f43`](NixOS/nixpkgs@22e61f4) buildah: 1.15.2 -> 1.16.0 * [`60f27064`](NixOS/nixpkgs@60f2706) gammastep: 2.0.1 -> 2.0.2 (NixOS/nixpkgs#97290) * [`1fa610bd`](NixOS/nixpkgs@1fa610b) chromium: Prefix $PATH with xdg_utils (NixOS/nixpkgs#96922) * [`1cd9dafc`](NixOS/nixpkgs@1cd9daf) ott: 0.30 -> 0.31 * [`0b64a703`](NixOS/nixpkgs@0b64a70) guile-sdl2: 0.4.0 -> 0.5.0 * [`dd272777`](NixOS/nixpkgs@dd27277) Revert "nixos/qemu-vm: support nix run" * [`8d5d41e7`](NixOS/nixpkgs@8d5d41e) kubernetes-helm: 3.3.0 -> 3.3.1 (NixOS/nixpkgs#97147) * [`6ed06dca`](NixOS/nixpkgs@6ed06dc) terragrunt: 0.23.33 -> 0.23.40 * [`2ff86abc`](NixOS/nixpkgs@2ff86ab) topgrade: 5.5.0 -> 5.7.0 * [`3690d1d7`](NixOS/nixpkgs@3690d1d) calibre: build with py3 by default * [`4b25b12f`](NixOS/nixpkgs@4b25b12) calibre: 4.22.0 -> 4.23.0 * [`2497bf42`](NixOS/nixpkgs@2497bf4) calibre: remove self reference * [`02e6ed4b`](NixOS/nixpkgs@02e6ed4) scc: 2.12.0 -> 2.13.0 * [`1936b11f`](NixOS/nixpkgs@1936b11) utils.bash: also "fix" cc-wrapper and pkg-config-wrapper * [`6f712077`](NixOS/nixpkgs@6f71207) ugrep: 2.5.3 -> 2.5.5 * [`b6efe9d6`](NixOS/nixpkgs@b6efe9d) vale: 2.3.3 -> 2.3.4 * [`8532b0ae`](NixOS/nixpkgs@8532b0a) vultr-cli: 0.3.2 -> 0.4.0 * [`4dd118b4`](NixOS/nixpkgs@4dd118b) timescale-prometheus: 0.1.0-beta.2 -> 0.1.0-beta.4 * [`2a82f71b`](NixOS/nixpkgs@2a82f71) proverif: 2.01 → 2.02pl1 * [`5d510968`](NixOS/nixpkgs@5d51096) nixos/prometheus-exporters: fix default firewall filter * [`7b537f99`](NixOS/nixpkgs@7b537f9) exa: remove maintainer * [`3487a7b8`](NixOS/nixpkgs@3487a7b) exodus: 20.1.30 -> 20.8.28 * [`1d2c243d`](NixOS/nixpkgs@1d2c243) dune_2: fix hash * [`d7fa5b6a`](NixOS/nixpkgs@d7fa5b6) liferea: 1.12.6 → 1.12.9 * [`3c0e3697`](NixOS/nixpkgs@3c0e369) liferea: remove myself from meta.maintainers * [`bd954783`](NixOS/nixpkgs@bd95478) liquidsoap: 1.3.4 → 1.4.2 * [`85afe9cb`](NixOS/nixpkgs@85afe9c) nixos/tests/installer: increase RAM in the VM * [`a3173612`](NixOS/nixpkgs@a317361) nixos/lorri: add package option

ofborg bot added 6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels May 27, 2020

evanjs requested a review from dasJ August 27, 2020 06:07

nixos/terraria: allow dataDir to be configured

8207a06

add dataDir option to terraria module

evanjs force-pushed the terraria/home branch from 59b554a to 8207a06 Compare September 5, 2020 19:29

evanjs changed the title ~~nixos/terraria: allow home to be configured~~ nixos/terraria: allow dataDir to be configured Sep 5, 2020

worldofpeace reviewed Sep 5, 2020

View reviewed changes

nixos/modules/services/games/terraria.nix Outdated Show resolved Hide resolved

Update nixos/modules/services/games/terraria.nix

56d6ecc

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>

worldofpeace approved these changes Sep 5, 2020

View reviewed changes

worldofpeace merged commit 854a229 into NixOS:master Sep 5, 2020

evanjs deleted the terraria/home branch September 5, 2020 20:39

github-actions bot mentioned this pull request Sep 8, 2020

niv unstable: update c59ea8b8 -> a3173612 pbogdan/shell-cmd#11

Merged

This was referenced Sep 8, 2020

niv unstable: update c59ea8b8 -> a3173612 pbogdan/tag#34

Merged

niv unstable: update c59ea8b8 -> a3173612 pbogdan/nix-hie#96

Merged

github-actions bot mentioned this pull request Sep 8, 2020

niv unstable: update c59ea8b8 -> a3173612 pbogdan/nvs#50

Merged

github-actions bot mentioned this pull request Sep 8, 2020

niv unstable: update c59ea8b8 -> a3173612 pbogdan/nix-nerd-fonts#44

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

nixos/terraria: allow dataDir to be configured #89033

nixos/terraria: allow dataDir to be configured #89033

evanjs commented May 27, 2020 •

edited

nixos/terraria: allow dataDir to be configured #89033

nixos/terraria: allow dataDir to be configured #89033

Conversation

evanjs commented May 27, 2020 • edited

Motivation for this change

evanjs commented May 27, 2020 •

edited