Merge pull request #273313 from Enzime/add/mosh-firewall-option
nixos/mosh: add `programs.mosh.openFirewall`
This commit is contained in:
commit
174fc675c8
1 changed files with 10 additions and 14 deletions
|
@ -1,7 +1,5 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
cfg = config.programs.mosh;
|
cfg = config.programs.mosh;
|
||||||
|
@ -9,28 +7,26 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.programs.mosh = {
|
options.programs.mosh = {
|
||||||
enable = mkOption {
|
enable = lib.mkEnableOption "mosh";
|
||||||
description = lib.mdDoc ''
|
openFirewall = lib.mkEnableOption "" // {
|
||||||
Whether to enable mosh. Note, this will open ports in your firewall!
|
description = "Whether to automatically open the necessary ports in the firewall.";
|
||||||
'';
|
default = true;
|
||||||
default = false;
|
|
||||||
type = lib.types.bool;
|
|
||||||
};
|
};
|
||||||
withUtempter = mkOption {
|
withUtempter = lib.mkEnableOption "" // {
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
Whether to enable libutempter for mosh.
|
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).
|
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!
|
Note, this will add a guid wrapper for the group utmp!
|
||||||
'';
|
'';
|
||||||
default = true;
|
default = true;
|
||||||
type = lib.types.bool;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
environment.systemPackages = with pkgs; [ mosh ];
|
environment.systemPackages = [ pkgs.mosh ];
|
||||||
networking.firewall.allowedUDPPortRanges = [ { from = 60000; to = 61000; } ];
|
networking.firewall.allowedUDPPortRanges = lib.optional cfg.openFirewall { from = 60000; to = 61000; };
|
||||||
security.wrappers = mkIf cfg.withUtempter {
|
security.wrappers = lib.mkIf cfg.withUtempter {
|
||||||
utempter = {
|
utempter = {
|
||||||
source = "${pkgs.libutempter}/lib/utempter/utempter";
|
source = "${pkgs.libutempter}/lib/utempter/utempter";
|
||||||
owner = "root";
|
owner = "root";
|
||||||
|
|
Loading…
Reference in a new issue