Merge pull request #273313 from Enzime/add/mosh-firewall-option

nixos/mosh: add `programs.mosh.openFirewall`
This commit is contained in:
Lin Jian 2023-12-16 12:24:42 -06:00 committed by GitHub
commit 174fc675c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,5 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.mosh;
@ -9,28 +7,26 @@ let
in
{
options.programs.mosh = {
enable = mkOption {
description = lib.mdDoc ''
Whether to enable mosh. Note, this will open ports in your firewall!
'';
default = false;
type = lib.types.bool;
enable = lib.mkEnableOption "mosh";
openFirewall = lib.mkEnableOption "" // {
description = "Whether to automatically open the necessary ports in the firewall.";
default = true;
};
withUtempter = mkOption {
withUtempter = lib.mkEnableOption "" // {
description = lib.mdDoc ''
Whether to enable libutempter for mosh.
This is required so that mosh can write to /var/run/utmp (which can be queried with `who` to display currently connected user sessions).
Note, this will add a guid wrapper for the group utmp!
'';
default = true;
type = lib.types.bool;
};
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ mosh ];
networking.firewall.allowedUDPPortRanges = [ { from = 60000; to = 61000; } ];
security.wrappers = mkIf cfg.withUtempter {
config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.mosh ];
networking.firewall.allowedUDPPortRanges = lib.optional cfg.openFirewall { from = 60000; to = 61000; };
security.wrappers = lib.mkIf cfg.withUtempter {
utempter = {
source = "${pkgs.libutempter}/lib/utempter/utempter";
owner = "root";