movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-06-04 18:00:59 +00:00 • committed by GitHub
commit 22e7031b28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 261 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

17
nixos/modules/services/mail/public-inbox.nix
View file

@ -275,9 +275,8 @@ in
default = {};
description = lib.mdDoc "public inboxes";
type = types.submodule {
# Keeping in line with the tradition of unnecessarily specific types, allow users to set
# freeform settings either globally under the `publicinbox` section, or for specific
# inboxes through additional nesting.
# Support both global options like `services.public-inbox.settings.publicinbox.imapserver`
# and inbox specific options like `services.public-inbox.settings.publicinbox.foo.address`.
freeformType = with types; attrsOf (oneOf [ iniAtom (attrsOf iniAtom) ]);
options.css = mkOption {
@ -285,12 +284,24 @@ in
default = [];
description = lib.mdDoc "The local path name of a CSS file for the PSGI web interface.";
};
options.imapserver = mkOption {
type = with types; listOf str;
default = [];
example = [ "imap.public-inbox.org" ];
description = lib.mdDoc "IMAP URLs to this public-inbox instance";
};
options.nntpserver = mkOption {
type = with types; listOf str;
default = [];
example = [ "nntp://news.public-inbox.org" "nntps://news.public-inbox.org" ];
description = lib.mdDoc "NNTP URLs to this public-inbox instance";
};
options.pop3server = mkOption {
type = with types; listOf str;
default = [];
example = [ "pop.public-inbox.org" ];
description = lib.mdDoc "POP3 URLs to this public-inbox instance";
};
options.wwwlisting = mkOption {
type = with types; enum [ "all" "404" "match=domain" ];
default = "404";