Merge pull request #286356 from Stunkymonkey/terraria-umask-group

nixos/terraria: prefer 'serviceConfig' over 'chmod/chgrp'
This commit is contained in:
lassulus 2024-04-03 21:05:22 +02:00 committed by GitHub
commit a41e12cc9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -148,16 +148,13 @@ in
serviceConfig = { serviceConfig = {
User = "terraria"; User = "terraria";
Group = "terraria";
Type = "forking"; Type = "forking";
GuessMainPID = true; GuessMainPID = true;
UMask = 007;
ExecStart = "${getBin pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}"; ExecStart = "${getBin pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}";
ExecStop = "${stopScript} $MAINPID"; ExecStop = "${stopScript} $MAINPID";
}; };
postStart = ''
${pkgs.coreutils}/bin/chmod 660 ${cfg.dataDir}/terraria.sock
${pkgs.coreutils}/bin/chgrp terraria ${cfg.dataDir}/terraria.sock
'';
}; };
networking.firewall = mkIf cfg.openFirewall { networking.firewall = mkIf cfg.openFirewall {