commit b4bacff13f020ad742800a1dc9f0f163af7dd9d4 · pyrox.dev/nixpkgs

+70 -18

nixos/modules/services/network-filesystems/kbfs.nix

···

       1
       1
        
       { config, lib, pkgs, ... }:

     

       2
       2
        
       with lib;

     

       3
       3
        
       let

     

       4
       4
       +
         inherit (config.security) wrapperDir;

     

       4
       5
        
         cfg = config.services.kbfs;

     

       5
       6
        
       

     

       6
       7
        
       in {

     
···

       15
       16
        
               type = types.bool;

     

       16
       17
        
               default = false;

     

       17
       18
        
               description = "Whether to mount the Keybase filesystem.";

     

       19
       19
       +
             };

     

       20
       20
       +
       

     

       21
       21
       +
             enableRedirector = mkOption {

     

       22
       22
       +
               type = types.bool;

     

       23
       23
       +
               default = false;

     

       24
       24
       +
               description = ''

     

       25
       25
       +
                 Whether to enable the Keybase root redirector service, allowing

     

       26
       26
       +
                 any user to access KBFS files via <literal>/keybase</literal>,

     

       27
       27
       +
                 which will show different contents depending on the requester.

     

       28
       28
       +
               '';

     

       18
       29
        
             };

     

       19
       30
        
       

     

       20
       31
        
             mountPoint = mkOption {

     
···

       41
       52
        
       

     

       42
       53
        
         ###### implementation

     

       43
       54
        
       

     

       44
       44
       -
         config = mkIf cfg.enable {

     

       55
       55
       +
         config = mkIf cfg.enable (mkMerge [

     

       56
       56
       +
           {

     

       57
       57
       +
             # Upstream: https://github.com/keybase/client/blob/master/packaging/linux/systemd/kbfs.service

     

       58
       58
       +
             systemd.user.services.kbfs = {

     

       59
       59
       +
               description = "Keybase File System";

     

       45
       60
        
       

     

       46
       46
       -
           systemd.user.services.kbfs = {

     

       47
       47
       -
             description = "Keybase File System";

     

       48
       48
       -
             requires = [ "keybase.service" ];

     

       49
       49
       -
             after = [ "keybase.service" ];

     

       50
       50
       -
             path = [ "/run/wrappers" ];

     

       51
       51
       -
             unitConfig.ConditionUser = "!@system";

     

       52
       52
       -
             serviceConfig = {

     

       53
       53
       -
               ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p ${cfg.mountPoint}";

     

       54
       54
       -
               ExecStart = "${pkgs.kbfs}/bin/kbfsfuse ${toString cfg.extraFlags} ${cfg.mountPoint}";

     

       55
       55
       -
               ExecStopPost = "/run/wrappers/bin/fusermount -u ${cfg.mountPoint}";

     

       56
       56
       -
               Restart = "on-failure";

     

       57
       57
       -
               PrivateTmp = true;

     

       61
       61
       +
               # Note that the "Requires" directive will cause a unit to be restarted whenever its dependency is restarted.

     

       62
       62
       +
               # Do not issue a hard dependency on keybase, because kbfs can reconnect to a restarted service.

     

       63
       63
       +
               # Do not issue a hard dependency on keybase-redirector, because it's ok if it fails (e.g., if it is disabled).

     

       64
       64
       +
               wants = [ "keybase.service" ] ++ optional cfg.enableRedirector "keybase-redirector.service";

     

       65
       65
       +
               path = [ "/run/wrappers" ];

     

       66
       66
       +
               unitConfig.ConditionUser = "!@system";

     

       67
       67
       +
       

     

       68
       68
       +
               serviceConfig = {

     

       69
       69
       +
                 Type = "notify";

     

       70
       70
       +
                 # Keybase notifies from a forked process

     

       71
       71
       +
                 EnvironmentFile = [

     

       72
       72
       +
                   "-%E/keybase/keybase.autogen.env"

     

       73
       73
       +
                   "-%E/keybase/keybase.env"

     

       74
       74
       +
                 ];

     

       75
       75
       +
                 ExecStartPre = [

     

       76
       76
       +
                   "${pkgs.coreutils}/bin/mkdir -p \"${cfg.mountPoint}\""

     

       77
       77
       +
                   "-${wrapperDir}/fusermount -uz \"${cfg.mountPoint}\""

     

       78
       78
       +
                 ];

     

       79
       79
       +
                 ExecStart = "${pkgs.kbfs}/bin/kbfsfuse ${toString cfg.extraFlags} \"${cfg.mountPoint}\"";

     

       80
       80
       +
                 ExecStop = "${wrapperDir}/fusermount -uz \"${cfg.mountPoint}\"";

     

       81
       81
       +
                 Restart = "on-failure";

     

       82
       82
       +
                 PrivateTmp = true;

     

       83
       83
       +
               };

     

       84
       84
       +
               wantedBy = [ "default.target" ];

     

       58
       85
        
             };

     

       59
       59
       -
             wantedBy = [ "default.target" ];

     

       60
       60
       -
           };

     

       61
       86
        
       

     

       62
       62
       -
           services.keybase.enable = true;

     

       87
       87
       +
             services.keybase.enable = true;

     

       88
       88
       +
       

     

       89
       89
       +
             environment.systemPackages = [ pkgs.kbfs ];

     

       90
       90
       +
           }

     

       91
       91
       +
       

     

       92
       92
       +
           (mkIf cfg.enableRedirector {

     

       93
       93
       +
             security.wrappers."keybase-redirector".source = "${pkgs.kbfs}/bin/redirector";

     

       63
       94
        
       

     

       64
       64
       -
           environment.systemPackages = [ pkgs.kbfs ];

     

       65
       65
       -
         };

     

       95
       95
       +
             systemd.tmpfiles.rules = [ "d /keybase 0755 root root 0" ];

     

       96
       96
       +
       

     

       97
       97
       +
             # Upstream: https://github.com/keybase/client/blob/master/packaging/linux/systemd/keybase-redirector.service

     

       98
       98
       +
             systemd.user.services.keybase-redirector = {

     

       99
       99
       +
               description = "Keybase Root Redirector for KBFS";

     

       100
       100
       +
               wants = [ "keybase.service" ];

     

       101
       101
       +
               unitConfig.ConditionUser = "!@system";

     

       102
       102
       +
       

     

       103
       103
       +
               serviceConfig = {

     

       104
       104
       +
                 EnvironmentFile = [

     

       105
       105
       +
                   "-%E/keybase/keybase.autogen.env"

     

       106
       106
       +
                   "-%E/keybase/keybase.env"

     

       107
       107
       +
                 ];

     

       108
       108
       +
                 # Note: The /keybase mount point is not currently configurable upstream.

     

       109
       109
       +
                 ExecStart = "${wrapperDir}/keybase-redirector /keybase";

     

       110
       110
       +
                 Restart = "on-failure";

     

       111
       111
       +
                 PrivateTmp = true;

     

       112
       112
       +
               };

     

       113
       113
       +
       

     

       114
       114
       +
               wantedBy = [ "default.target" ];

     

       115
       115
       +
             };

     

       116
       116
       +
           })

     

       117
       117
       +
         ]);

     

       66
       118
        
       }

+8 -3

nixos/modules/services/networking/keybase.nix

···

       24
       24
        
       

     

       25
       25
        
         config = mkIf cfg.enable {

     

       26
       26
        
       

     

       27
       27
       +
           # Upstream: https://github.com/keybase/client/blob/master/packaging/linux/systemd/keybase.service

     

       27
       28
        
           systemd.user.services.keybase = {

     

       28
       29
        
             description = "Keybase service";

     

       29
       30
        
             unitConfig.ConditionUser = "!@system";

     

       31
       31
       +
             environment.KEYBASE_SERVICE_TYPE = "systemd";

     

       30
       32
        
             serviceConfig = {

     

       31
       31
       -
               ExecStart = ''

     

       32
       32
       -
                 ${pkgs.keybase}/bin/keybase service --auto-forked

     

       33
       33
       -
               '';

     

       33
       33
       +
               Type = "notify";

     

       34
       34
       +
               EnvironmentFile = [

     

       35
       35
       +
                 "-%E/keybase/keybase.autogen.env"

     

       36
       36
       +
                 "-%E/keybase/keybase.env"

     

       37
       37
       +
               ];

     

       38
       38
       +
               ExecStart = "${pkgs.keybase}/bin/keybase service";

     

       34
       39
        
               Restart = "on-failure";

     

       35
       40
        
               PrivateTmp = true;

     

       36
       41
        
             };