fix: Remove dynamicUser and fix little bugs
This commit is contained in:
parent
183111ea58
commit
8d8924f5f4
1 changed files with 12 additions and 5 deletions
17
module.nix
17
module.nix
|
@ -2,9 +2,8 @@
|
||||||
let
|
let
|
||||||
cfg = config.services.signal-irc-bridge;
|
cfg = config.services.signal-irc-bridge;
|
||||||
commonServiceOptions = {
|
commonServiceOptions = {
|
||||||
DynamicUser = true;
|
User = "signal-irc";
|
||||||
User = "signal-irc-client";
|
Group = "signal-irc";
|
||||||
Group = "nginx";
|
|
||||||
StateDirectory = "signal-cli";
|
StateDirectory = "signal-cli";
|
||||||
RuntimeDirectory = "signal-cli";
|
RuntimeDirectory = "signal-cli";
|
||||||
|
|
||||||
|
@ -19,7 +18,7 @@ let
|
||||||
ProtectProc="invisible";
|
ProtectProc="invisible";
|
||||||
PrivateUsers=true;
|
PrivateUsers=true;
|
||||||
ProtectHome=true;
|
ProtectHome=true;
|
||||||
UMask="0077";
|
UMask="0027";
|
||||||
RuntimeDirectoryMode="0750";
|
RuntimeDirectoryMode="0750";
|
||||||
StateDirectoryMode="0750";
|
StateDirectoryMode="0750";
|
||||||
};
|
};
|
||||||
|
@ -56,7 +55,7 @@ in {
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
RestartSec= "5s";
|
RestartSec= "5s";
|
||||||
|
|
||||||
LoadCredentials = [ "config:${cfg.configFile}" ];
|
LoadCredential = [ "config:${cfg.configFile}" ];
|
||||||
|
|
||||||
# Change state/runtime dirs because it deletes the socket else
|
# Change state/runtime dirs because it deletes the socket else
|
||||||
StateDirectory = "signal-irc";
|
StateDirectory = "signal-irc";
|
||||||
|
@ -74,5 +73,13 @@ in {
|
||||||
environment.systemPackages = lib.mkIf cfg.enable [
|
environment.systemPackages = lib.mkIf cfg.enable [
|
||||||
pkgs.signal-cli
|
pkgs.signal-cli
|
||||||
];
|
];
|
||||||
|
|
||||||
|
users = lib.mkIf cfg.enable {
|
||||||
|
users.signal-irc = {
|
||||||
|
isSystemUser = true;
|
||||||
|
group = "signal-irc";
|
||||||
|
};
|
||||||
|
groups.signal-irc = {};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue