kbfs, nixos/keybase, nixos/kbfs: fix KBFS, add enableRedirector option #75922
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ofborg
bot
added
6.topic: nixos
rvolosatovs
approved these changes
Dec 19, 2019
| environment.KEYBASE_SERVICE_TYPE = "systemd"; | ||
|
|
||
| script = '' | ||
| ${pkgs.keybase}/bin/keybase --use-default-log-file --debug service |
There was a problem hiding this comment.
--debug seems unnecessary, but I guess since upstream does that it should be fine
| } | ||
|
|
tadfisher
force-pushed
the
kbfs-fixes
branch
from
e207451
to
bf426f6
Compare
tadfisher
force-pushed
the
kbfs-fixes
branch
from
bf426f6
to
b4bacff
Compare
|
Addressed feedback. I was also able to remove the |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/104 |
|
LGTM, Thank you |
anna328p
pushed a commit
to anna328p/nixpkgs
that referenced
this pull request
Feb 2, 2020
kbfs, nixos/keybase, nixos/kbfs: fix KBFS, add enableRedirector option
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
KBFS wasn't working on my system using the NixOS module, so I updated the systemd services to mirror the upstream service files. Comments from upstream are included, and the main changes are:
notifyservice type which is now supported upstream.KEYBASE_SERVICE_TYPE=systemdin the environment forkeybase.service; this is apparently what fixed the issues between the keybase and kbfs on my system.$XDG_CONFIG_DIR/keybase/keybase{.autogen}.env, which is populated by thekeybase ctl initcommand as specified in the documentation. This is entirely optional and my setup works without doing this.I also wanted to run
keybase-redirectoron a multi-user machine, so I addedconfig.services.enableRedirector. This requires the following shenanigans:kbfspackage./keybaseneeds to exist; usesystemd.tmpfiles.rulesto add it and clean it up ifenableRedirectoris disabled. If there is a standard way to do this for user services, I'd be happy to change this.setuidwrapper for${pkgs.kbfs}/bin/redirector, namedkeybase-redirectorfor consistency with the documentation and other distributions.setpcapwrapper instead; however, the redirector callssetreuidand thus would requireCAP_SYS_ADMINanyway.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @rvolosatovs @bennofs @np