openvpn: add riseup in net namespace

[sourcephile-nix.git] / machines / mermet / rspamd / autogeree.net.nix

diff --git a/machines/mermet/rspamd/autogeree.net.nix b/machines/mermet/rspamd/autogeree.net.nix
index b858654032a0ad0103d7aed8a08a3f4bbb0e1df6..bcadc0b4706a54b212c3c662895dc0e709a2f850 100644 (file)
--- a/machines/mermet/rspamd/autogeree.net.nix
+++ b/machines/mermet/rspamd/autogeree.net.nix
@@ -1,8 +1,8 @@
-{ domain, ... }:
 { pkgs, lib, config, ... }:
 let
-  inherit (config.security) pass;
+  inherit (config.security) gnupg;
   inherit (config.services) rspamd;
+  domain = "autogeree.net";
   selector = "20200101";
 in
 {
@@ -18,12 +18,12 @@ services.knot.zones."${domain}".data = ''
     "+hH+Mr/4V1wnKtdosk/7+3VIQ6clTIfWhD6PlnWd78Uo5lfWnYxTem7EMc2q7j6tzGwj+Q+b4Li9fdhLqxGuD0V64/nVZit90b0HyfiV5srln2lK6Hczrwqr0gOEBGQ4YeLjOF6ldaV01mFWR9ddr9a5/gVCqw8vw7vhqXvU7yK8VHW2rdsvkNZ0bDOa66MCveD7pH2vyljrfZq9k0T/NLHrsu8CAwEAAQ=="
   )
 '';
-security.pass.secrets."rspamd/dkim/${domain}/${selector}.key" = {
+security.gnupg.secrets."rspamd/dkim/${domain}/${selector}.key" = {
   user = rspamd.user;
   postStart = "systemctl try-restart --no-block rspamd";
 };
 systemd.services.rspamd = {
-  wants = [ pass.secrets."rspamd/dkim/${domain}/${selector}.key".service ];
-  after = [ pass.secrets."rspamd/dkim/${domain}/${selector}.key".service ];
+  wants = [ gnupg.secrets."rspamd/dkim/${domain}/${selector}.key".service ];
+  after = [ gnupg.secrets."rspamd/dkim/${domain}/${selector}.key".service ];
 };
 }