diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /modules/server | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'modules/server')
| -rw-r--r-- | modules/server/mail/public-inbox/default.nix | 18 | ||||
| -rw-r--r-- | modules/server/spectrum/public-inbox/default.nix | 6 |
2 files changed, 15 insertions, 9 deletions
diff --git a/modules/server/mail/public-inbox/default.nix b/modules/server/mail/public-inbox/default.nix index efd1bb1f05b7..a47908bfb7fc 100644 --- a/modules/server/mail/public-inbox/default.nix +++ b/modules/server/mail/public-inbox/default.nix @@ -29,19 +29,25 @@ in { services.public-inbox.enable = true; + services.public-inbox.mda.enable = true; services.public-inbox.http.enable = true; services.public-inbox.nntp.enable = true; - + services.public-inbox.path = with pkgs; [ spamassassin ]; services.public-inbox.mda.args = [ "--no-precheck" ]; - services.public-inbox.mda.spamCheck = "spamc"; - services.public-inbox.nntp.extraGroups = [ "acme" ]; - services.public-inbox.wwwListing = "match=domain"; + services.public-inbox.settings.publicinboxmda.spamcheck = "spamc"; + services.public-inbox.http.port = "/run/public-inbox-httpd.sock"; + services.public-inbox.postfix.enable = true; + services.public-inbox.settings.publicinbox.wwwlisting = "match=domain"; + + services.public-inbox.nntp.port = null; + systemd.sockets.public-inbox-nntpd.listenStreams = [ "0.0.0.0:119" "0.0.0.0:563" ]; + systemd.services.public-inbox-nntpd.serviceConfig.SupplementaryGroups = [ "public-inbox" "acme" ]; - services.public-inbox.config.publicinbox.css = + services.public-inbox.settings.publicinbox.css = [ "href=https://spectrum-os.org/lists/archives/public-inbox.css" ]; - services.public-inbox.config.publicinbox.sourceinfo = + services.public-inbox.settings.publicinbox.sourceinfo = let url = "https://ftp.qyliss.net/public-inbox/${tarballName}"; in (pkgs.writeText "public-inbox-source-info.html" '' diff --git a/modules/server/spectrum/public-inbox/default.nix b/modules/server/spectrum/public-inbox/default.nix index e8c1c817b608..0b13a0576d3b 100644 --- a/modules/server/spectrum/public-inbox/default.nix +++ b/modules/server/spectrum/public-inbox/default.nix @@ -12,10 +12,10 @@ in services.public-inbox.nntp.cert = "/var/lib/acme/spectrum-os.org/fullchain.pem"; services.public-inbox.nntp.key = "/var/lib/acme/spectrum-os.org/key.pem"; - services.public-inbox.nntpServer = + services.public-inbox.settings.publicinbox.nntpserver = [ "nntps://spectrum-os.org" "nntp://spectrum-os.org" ]; - services.public-inbox.config.coderepo = lib.genAttrs repos (name: { + services.public-inbox.settings.coderepo = lib.genAttrs repos (name: { dir = "/home/spectrum/git/${name}.git"; cgitUrl = "https://spectrum-os.org/git/${name}"; }); @@ -50,6 +50,6 @@ in filter = "PublicInbox::Filter::Mirror"; url = "https://spectrum-os.org/lists/archives/spectrum-devel"; newsgroup = "inbox.comp.spectrum.devel"; - config.coderepo = repos; + coderepo = repos; }; } |