daniel/dotfiles
1
0
Fork 0
Code Activity Actions

signald: remove

Browse source
This commit is contained in:
Daniel Kempkens 2024-01-30 20:40:21 +01:00
parent 8db405a9c4
commit a05a05ca0f
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
4 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
agenix/hosts/tanker/config.nix
View file

@ -128,10 +128,6 @@
file = ./mautrix-signal/config.age; file = ./mautrix-signal/config.age;
}; };
signald-environment = {
file = ./signald/environment.age;
};
synapse-extra-config = { synapse-extra-config = {
file = ./synapse/extraConfig.age; file = ./synapse/extraConfig.age;
owner = "matrix-synapse"; owner = "matrix-synapse";

10
agenix/hosts/tanker/signald/environment.age
View file

@ -1,10 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 MtGp6g /N1cHH7SmlpEdvKEcMzVflInTXChp+eWJFU2RoPWMUk
7nLndAtQ3DWXYmPvwq9tDPBiPLJMuDuCRtSXdFveSoo
-> ssh-ed25519 iO8/4g WSUXe/SRWLMN23PWyOM7qOCbXOFvTrzmTcq0zW/ABFs
NmQoYqT0x6t0WByQrIg+OAvP4VUU5tVydAHfVTZvPUE
-> eo6mwb;-grease :nS'C`f ?/iI)
oQ4Y4ksapQU8WwrdzObrSTiUiS37dk+c180046s7BqC6GX8iXFjR9kQSPb6tR9bl
Nhh/zHwzdGQmy7VekRL8ZdpbUeKd5D6X7w
--- aHWIb4WJ+O2kXUGFczOA6ngejy6jkMOmrFmcKLllq8s
*?DGõ¨L5¯¸Ä‚Bf&AH¢;÷ aÀsŒã%1Íh1rdO­“²&ºq"DÕ`CQà5€Ÿ—xÐqÎÁ¸2¶Îñ»_æ[g¥½‹­Ddñó'+<2B>g¤)6nïÈ/Ä*,ð§—;lxS;R[”‹À†cµ ›(

2
secrets.nix
View file

@ -61,8 +61,6 @@ in
"agenix/hosts/tanker/mautrix-signal/config.age".publicKeys = tanker; "agenix/hosts/tanker/mautrix-signal/config.age".publicKeys = tanker;
"agenix/hosts/tanker/signald/environment.age".publicKeys = tanker;
"agenix/hosts/tanker/mautrix-whatsapp/config.age".publicKeys = tanker; "agenix/hosts/tanker/mautrix-whatsapp/config.age".publicKeys = tanker;
"agenix/hosts/tanker/weewx/config.age".publicKeys = tanker; "agenix/hosts/tanker/weewx/config.age".publicKeys = tanker;

19
system/nixos/matrix/mautrix-signal.nix
View file

@ -1,20 +1,23 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
{ {
services.signald.enable = true; # Re-use old signald user and group
systemd.services.signald.serviceConfig.EnvironmentFile = [ users.users.signald = {
config.age.secrets.signald-environment.path group = "signald";
]; isSystemUser = true;
};
users.groups.signald = { };
systemd.services.mautrix-signal = { systemd.services.mautrix-signal = {
description = "A Matrix-Signal puppeting bridge"; description = "A Matrix-Signal puppeting bridge";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "matrix-synapse.service" "signald.service" ]; requires = [ "matrix-synapse.service" ];
after = [ "matrix-synapse.service" "signald.service" ]; after = [ "matrix-synapse.service" ];
restartTriggers = [ "${config.age.secrets.mautrix-signal-config.file}" ]; restartTriggers = [ "${config.age.secrets.mautrix-signal-config.file}" ];
serviceConfig = { serviceConfig = {
User = config.services.signald.user; User = "signald";
Group = config.services.signald.group; Group = "signald";
LoadCredential = [ "config:${config.age.secrets.mautrix-signal-config.path}" ]; LoadCredential = [ "config:${config.age.secrets.mautrix-signal-config.path}" ];
ExecStart = "${lib.getExe pkgs.mautrix-signal} --config=%d/config --no-update"; ExecStart = "${lib.getExe pkgs.mautrix-signal} --config=%d/config --no-update";
Restart = "on-failure"; Restart = "on-failure";