diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2018-10-17 23:39:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 23:39:30 +0200 |
| commit | 13e41106500d396a7326d00abdfaf8fa725331f9 (patch) | |
| tree | 85a896b9c9045c21bb00afae5659fd73535884f1 /nixos | |
| parent | d767ba99964eb776c2b482ca8a3a0ef42d7ccf8b (diff) | |
| parent | 018573b7579b4212d7001bf6f0e9b31e1bdadb14 (diff) | |
Merge pull request #48131 from Ma27/weechat-multiuser-support
nixos/weechat: add setuid wrapper for `screen' to ensure true multiuser capabilities
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/weechat.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/misc/weechat.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix index 1fcfb440485dc..c6ff540ea12f4 100644 --- a/nixos/modules/services/misc/weechat.nix +++ b/nixos/modules/services/misc/weechat.nix @@ -46,10 +46,12 @@ in Group = "weechat"; RemainAfterExit = "yes"; }; - script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}"; + script = "exec ${config.security.wrapperDir}/screen -Dm -S ${cfg.sessionName} ${cfg.binary}"; wantedBy = [ "multi-user.target" ]; wants = [ "network.target" ]; }; + + security.wrappers.screen.source = "${pkgs.screen}/bin/screen"; }; meta.doc = ./weechat.xml; diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml index 9c9ee0448c926..b7f755bbc5c79 100644 --- a/nixos/modules/services/misc/weechat.xml +++ b/nixos/modules/services/misc/weechat.xml @@ -54,7 +54,7 @@ </programlisting> Now, the session can be re-attached like this: <programlisting> -screen -r weechat-screen +screen -x weechat/weechat-screen </programlisting> </para> |