diff options
| author | makefu <github@syntax-fehler.de> | 2022-01-06 13:18:48 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2022-01-06 13:18:48 +0100 |
| commit | fe0e878c1fa9ae749aaf5c3169994118794f152b (patch) | |
| tree | 6b6e1f22f803830bde9266f6afc96985d5eb12c3 /krebs | |
| parent | dfe5f39dabb7626804e29797c51ac0df87656129 (diff) | |
| parent | deda4c978956e39c3b6345e5ef5604b2bc020e00 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/exim.nix | 5 | ||||
| -rw-r--r-- | krebs/3modules/external/default.nix | 4 | ||||
| -rw-r--r-- | krebs/3modules/htgen.nix | 7 |
3 files changed, 12 insertions, 4 deletions
diff --git a/krebs/3modules/exim.nix b/krebs/3modules/exim.nix index 972c7f437..0f0aa67f0 100644 --- a/krebs/3modules/exim.nix +++ b/krebs/3modules/exim.nix @@ -65,8 +65,9 @@ in { config.environment.etc."exim.conf".source ]; serviceConfig = { - ExecStart = "${pkgs.exim}/bin/exim -bdf -q30m"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStart = "+${pkgs.exim}/bin/exim -bdf -q30m"; + ExecReload = "+${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + User = cfg.user.name; }; wantedBy = [ "multi-user.target" ]; }; diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 4c4e53f2f..66914797d 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -320,7 +320,7 @@ in { aliases = [ "zaatar.r" "zaatar.kmein.r" - "radio.kmein.r" + "grocy.kmein.r" "bvg.kmein.r" "moodle.kmein.r" ]; @@ -662,6 +662,7 @@ in { vDZ+BoHCjq9FfQrAu1+E83yCYyu+3fWrLSgYyrqjg0gPcCcnb1g6hqECAwEAAQ== -----END RSA PUBLIC KEY----- ''; + tinc.pubkey_ed25519 = "PiqJGofbo6941m20NJM3yhUoWKTNyLCtTPzsKcrvFSL"; }; }; }; @@ -686,6 +687,7 @@ in { /n/eHElmKWoMCXhkV/mee1Cl2Y74XKivM6ov3lLvIDRxdXl46PvBFVkCAwEAAQ== -----END RSA PUBLIC KEY----- ''; + tinc.pubkey_ed25519 = "P9yurwK2l1npimgm3yk8WXigWLfEtJ6G1w/3kVCPG7F"; }; }; }; diff --git a/krebs/3modules/htgen.nix b/krebs/3modules/htgen.nix index 4221703ec..375e26974 100644 --- a/krebs/3modules/htgen.nix +++ b/krebs/3modules/htgen.nix @@ -75,7 +75,12 @@ let } ) cfg; - users.groups = mapAttrs (_: _: {}) cfg; + users.groups = mapAttrs' (name: htgen: + nameValuePair htgen.user.name { + name = htgen.user.name; + gid = htgen.user.uid; + } + ) cfg; }; in out |