Parnell Springmeyer
bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts
2017-01-25 11:08:05 -08:00
Peter Jones
75aaae34a9
dovecot: Fix sieve scripts
...
Make sure that the output of the sieve compiler produces files that
have a newer time stamp than the source sieve script. Otherwise you
get errors in the logs about Dovecot not being able to compile do to a
permission issue.
2017-01-13 14:19:29 -07:00
Gregor Kleen
65f0ddbd53
postgrey: improve formatting
2017-01-02 15:42:51 +01:00
Gregor Kleen
58fa71b39c
postgrey: allow additional whitelists
2017-01-02 15:40:54 +01:00
Gregor Kleen
82291bae49
postgrey: more verbose default socket
2017-01-02 15:32:50 +01:00
Gregor Kleen
3c0d02c387
postgrey: coerce integers
2017-01-02 15:27:00 +01:00
Gregor Kleen
e2dd0799a8
postgrey: fix submodule syntax
2017-01-02 15:19:00 +01:00
Gregor Kleen
e196ad2c66
postgrey: add descriptions to IPv?CIDR
2017-01-02 15:12:39 +01:00
Gregor Kleen
06bcdc177c
postgrey: extended configuration
2017-01-02 15:10:03 +01:00
Joachim Fasting
361633db3b
rmilter service: fix invalid directive
...
RuntimeDirectoryPermissions -> RuntimeDirectoryMode
Would result in warnings like "unknown lvalue" on startup
2016-12-18 12:42:37 +01:00
Gregor Kleen
d5ec2a2c9d
postsrsd: additional configuration
...
fixes #19933
2016-12-11 21:43:45 +01:00
Aristid Breitkreuz
db537ed87d
opensmtpd service: fix evaluation error caused by Joachim's refactoring
2016-10-30 11:34:16 +01:00
Joachim Fasting
ab1e216942
opensmtpd service: remove redundant wants network.target
...
Already part of normal bootup.
2016-10-26 03:01:56 +02:00
Joachim Fasting
f24ffc4919
opensmtpd service: require serverConfiguration
...
If the daemon won't function without a valid config, it makes no sense
to default to an empty config. Instead, turn that case into a build
failure.
2016-10-26 03:01:56 +02:00
Joachim Fasting
3851afc8eb
opensmtpd service: path -> package for option procPackages
2016-10-26 03:01:56 +02:00
Joachim Fasting
946fe73b56
opensmtpd service: use explicit pkgs for consistency
2016-10-26 03:01:56 +02:00
Joachim Fasting
37afc5cda1
opensmtpd service: serviceConfiguration option as types.lines
2016-10-26 03:01:56 +02:00
Emery Hemingway
b675619391
nixos: use types.lines for extraConfig
2016-10-23 19:41:43 +02:00
Herwig Hochleitner
5fa7cf9f97
postgrey: add types to service
2016-09-27 15:35:02 +02:00
Herwig Hochleitner
5609fe521d
postgrey: init at 1.36 (includes service)
2016-09-27 15:35:02 +02:00
aszlig
2af7051197
nixos/offlineimap: Move to services/mail
...
The services/networking directory is already quite polluted and the
first point where I was looking for the offlineimap module was in
services/mail and didn't find it there.
Offlineimap already has IMAP in its name and clearly belongs to the
"mail" category so let's move it there.
Tested by evaluating a configuration with services.offlineimap enabled.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @DamienCassou
2016-09-26 21:18:06 +02:00
Alexander Ried
27bc34f1e4
treewide: deprecate ip-up.target ( #18319 )
...
Systemd upstream provides targets for networking. This also includes a target network-online.target.
In this PR I remove / replace most occurrences since some of them were even wrong and could delay startup.
2016-09-10 18:03:59 +02:00
Langston Barrett
492a90f1c9
dovecot service: require mail{User,Group} with sieveScripts
...
fixes #17702 .
2016-09-07 01:50:59 +00:00
Parnell Springmeyer
98c058a1ee
Adapting everything for the merged permissions wrappers work.
2016-09-01 19:21:06 -05:00
Parnell Springmeyer
390ab0b3ef
everything?: Updating every package that depended on the old setuidPrograms configuration.
2016-09-01 19:17:43 -05:00
obadz
03b9a159fe
opensmtpd nixos module: chmod & chown until the daemon's heart's content
2016-08-30 02:13:22 +01:00
Peter Hoeg
65ef5d8f5b
rspam module: use mkEnableOption
...
See #17329 .
2016-07-28 07:06:35 +02:00
Franz Pletz
8a1e7cd556
rspamd service: fix runtime directory, log to syslog
...
Fixes #17144 .
2016-07-28 06:22:29 +02:00
Franz Pletz
d23521b16c
rmilter service: use runtime dirctory for socket
2016-07-28 06:22:23 +02:00
zimbatm
28fa4a2f03
Escape all shell arguments uniformly
2016-06-12 18:11:37 +01:00
uwap
1e72706d66
Change default to postfix default.
2016-06-10 15:10:28 +02:00
uwap
ab0547b16f
Choose a better default for services.postfix.submissionOptions
2016-06-10 14:51:43 +02:00
uwap
cc658b695a
Make submission options more flexible
2016-06-09 18:06:07 +02:00
uwap
d1e4ee146d
Postfix: Add an option to enable Submission
...
Adds services.postfix.enableSubmission and services.postfix.extraSubmissionOptions to make it easy to enable submission in master.cf
2016-06-09 00:15:55 +02:00
obadz
e69ed2b64b
opensmtpd: 5.7.3p2 -> 5.9.2p1
2016-05-23 02:59:20 +01:00
Peter Simons
d270604117
nixos: remove redundant services.dovecot2.package option
...
Instead of using this option, please modify the dovecot package by means of an
override. For example:
nixpkgs.config.packageOverrides = super: {
dovecot = super.dovecot.override { withPgSQL = true; };
};
Closes https://github.com/NixOS/nixpkgs/issues/14097 .
2016-05-06 10:10:06 +02:00
Franz Pletz
02760890f3
Merge pull request #14992 from avnik/rspamd
...
Rspamd/Rmilter update
2016-05-01 12:49:56 +02:00
Alexander V. Nikolaev
36954ee405
rspamd: configurable bindSocket and bindUISocket
2016-04-28 14:21:19 +03:00
Alexander V. Nikolaev
5c260399e1
rmilter: correct paths to sockets
2016-04-28 14:21:18 +03:00
Alexander V. Nikolaev
c84c174eb2
rmilter: socket activation in nixos
2016-04-28 14:21:04 +03:00
Nikolay Amiantov
dfe608c8a2
symlinkJoin: accept set as an argument with additional options
2016-04-26 15:37:42 +03:00
Nikolay Amiantov
ea5c7d553c
dspam service: run after postgresql to prevent segfaults
2016-03-27 19:23:01 +03:00
Eelco Dolstra
fca9b335ae
Hide sendmailSetuidWrapper
2016-03-25 16:08:34 +01:00
Peter Simons
6c601ed1f0
Merge pull request #13838 from peti/drop-old-dovecot-versions
...
Drop support for dovecot 2.1.x from Nixpkgs and NixOS.
2016-03-16 14:36:52 +01:00
Peter Simons
c73a22aed5
Drop support for dovecot 2.1.x from Nixpkgs and NixOS.
...
Version 2.2.x has been stable for a long time; let's give up support for
the obsolete version.
2016-03-11 16:03:09 +01:00
Peter Simons
24fe7bab08
Drop support for postfix 2.x from Nixpkgs and NixOS.
...
Version 3.x has been stable for a long time; let's give up support for
the obsolete versions.
2016-03-11 16:01:43 +01:00
Peter Simons
ce6a1a6cea
Revert "Drop support for postfix 2.x from Nixpkgs and NixOS."
...
This reverts commit a889c683dd
2016-03-11 16:00:49 +01:00
Peter Simons
a889c683dd
Drop support for postfix 2.x from Nixpkgs and NixOS.
...
Version 3.x has been stable for a long time; let's give up support for
the obsolete versions.
2016-03-11 15:58:03 +01:00
Nikolay Amiantov
26bf9b28d8
opendkim service: improve domains documentation
2016-03-04 14:51:28 +03:00
Peter Simons
ed5eb2aed8
Fix Emacs syntax highlighting in NixOS dovecot module.
2016-03-02 16:11:49 +01:00
Nikolay Amiantov
a0afc49f0f
dspam service: restrict socket access
2016-02-14 10:35:06 +03:00
Nikolay Amiantov
2cee5a42b0
dspam service: set ClientHost
2016-02-14 10:35:04 +03:00
Nikolay Amiantov
c9d38164b7
dspam service: make maintenance script verbose
2016-02-12 18:00:00 +03:00
Peter Simons
7bd6fc90cb
Merge pull request #12725 from jerith666/postfix-dns-bl
...
postfix service: implement DNS blacklist support
2016-02-12 12:43:27 +01:00
Matt McHenry
40c7d554d4
postfix service: implement DNS blacklist support
2016-02-11 22:13:09 -05:00
Nikolay Amiantov
ccece1ca88
dspam service: restart on failure
2016-02-11 14:03:34 +03:00
Nikolay Amiantov
37bb4855c8
postfix module: fix link to postfix-files
2016-02-10 02:59:15 +03:00
Nikolay Amiantov
0024c10a5c
dovecot service: add sendmail_path
2016-02-10 02:06:10 +03:00
Nikolay Amiantov
2202bb9cf5
postsrsd: fix secret generation
2016-02-10 02:05:53 +03:00
Rickard Nilsson
5c20877d40
opensmtpd: Add option that can disable adding sendmail to the system path
2016-02-06 11:54:56 +01:00
Nikolay Amiantov
bf208745ab
Merge pull request #12290 from abbradar/dovecot-updates
...
Rework dovecot module, add and update plugins, default Dovecot to 2.2
2016-01-23 12:02:23 +03:00
Nikolay Amiantov
5b5e2c05c4
nixos/dovecot: add mail user and group
2016-01-21 12:53:26 +03:00
Nikolay Amiantov
b781cf1a12
nixos/dovecot: add sieveScripts support
2016-01-21 12:53:26 +03:00
Nikolay Amiantov
39bbac96af
nixos/dovecot: symlink system-wide config and use it
2016-01-21 12:53:25 +03:00
Nikolay Amiantov
70e77f9b53
nixos/dovecot: use new modules directory
2016-01-21 12:53:25 +03:00
Nikolay Amiantov
94a43b41af
nixos/dovecot: add dovecot package to modules, force proper dovecot version
2016-01-21 12:53:25 +03:00
Nikolay Amiantov
b2b58642fe
nixos/dovecot: add 'protocols' option
2016-01-21 12:53:25 +03:00
Nikolay Amiantov
122929cda7
nixos/dovecot: use systemd's RuntimeDirectory instead of creating it by ourselves
2016-01-21 12:53:25 +03:00
Nikolay Amiantov
9c7b067c6a
nixos/dovecot: create user/group only if they are default
2016-01-21 12:53:24 +03:00
Nikolay Amiantov
d1a9c55d91
nixos/dovecot: add reload command
2016-01-21 12:53:24 +03:00
Alexander V. Nikolaev
39bd9be5a9
postfix: use built-in set-permission tool to setup queue
...
Make top level /var/lib/postfix as root:root 0755
After generating custom configs in /var/lib/postfix/conf,
`postfix set-permissions` called, to perform all required tricks
related to queue handling (postfix use file mode bits to keep
some internal statuses, so `chmod -R` not recommended by authors,
see comments in $out/libexec/postfix/post-install for details)
Also post-install script was patched, to skip permission check/update
for files inside $out, as well as symlinks following to $NIX_STORE.
Config file `main.cf` extended with all default directory locations,
to prevent post-install script from guessing and overwrite them.
And finally all actions in activation script snippets performed
by postmap/postalias/postfix tools from current build, not random one
from paths.
2016-01-20 14:52:59 +02:00
Thomas Strobel
a04a7272aa
Add missing 'type', 'defaultText' and 'literalExample' in module definitions
...
- add missing types in module definitions
- add missing 'defaultText' in module definitions
- wrap example with 'literalExample' where necessary in module definitions
2016-01-17 19:41:23 +01:00
Alexander V. Nikolaev
de8dea4821
nixos: add module for rmilter
2016-01-16 15:12:30 +02:00
Alexander V. Nikolaev
14926f08a3
nixos: Add module for rspamd
2016-01-16 15:11:36 +02:00
aszlig
7e36514c90
nixos/postfix: Set type for extraConfig to "lines"
...
Regression introduced by 3891d3e654
2016-01-15 17:57:09 +01:00
Peter Simons
ae6fc4c5be
Merge pull request #12293 from abbradar/postfix-updates
...
Rework postfix module and package
2016-01-13 14:12:50 +01:00
Nikolay Amiantov
b4179c5612
nixos/dspam: add module
2016-01-13 13:08:55 +03:00
Nikolay Amiantov
f5efac09aa
nixos/opendkim: add module
2016-01-13 13:07:46 +03:00
Nikolay Amiantov
c51d08cf27
nixos/postsrsd: add module
2016-01-13 13:04:12 +03:00
Nikolay Amiantov
d3a19f1b8e
nixos/postfix: backwards compatibility with /var/postfix
2016-01-12 18:01:27 +03:00
Nikolay Amiantov
1edb62b40a
nixos/postfix: add options to compile additional maps and aliases
2016-01-12 18:00:54 +03:00
Nikolay Amiantov
9c502abb1c
nixos/postfix: use path instead of direct package mentions
2016-01-12 17:56:54 +03:00
Nikolay Amiantov
902dd35d47
nixos/postfix: move scripts to serviceConfig
2016-01-12 17:54:44 +03:00
Nikolay Amiantov
ef3102b27e
nixos/postfix: move /var/postfix to /var/lib/postfix, fix access rights
2016-01-12 17:54:41 +03:00
Nikolay Amiantov
54bc19270b
nixos/postfix: add users and groups only if needed, fix group name
2016-01-12 16:41:35 +03:00
Nikolay Amiantov
22fb0cb058
nixos/postfix: don't emit alias_maps config option if we don't have aliases set
2016-01-12 16:41:34 +03:00
Nikolay Amiantov
3891d3e654
nixos/postfix: add types
2016-01-10 06:07:38 +03:00
Robin Gloster
88292fdf09
jobs -> systemd.services
2016-01-07 06:39:06 +00:00
Viktor Kleen
ebd8e2c380
postfix service: include configuration option for transport maps
2016-01-05 02:59:16 -08:00
Viktor Kleen
8fad959b15
postfix service: make SMTP services optional using enableSmtp option
2016-01-05 02:57:52 -08:00
Christoph Hrdinka
3f4276369e
dovecot service: refactor module
2015-12-10 01:08:50 +01:00
William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Peter Simons
adb74ad2f9
Merge pull request #10620 from gebner/postfix-3.0.3
...
postfix: 2.11.5 -> 3.0.3
2015-11-08 18:10:26 +01:00
William A. Kennington III
4251612faa
Merge branch 'master.upstream' into staging.upstream
2015-11-04 01:00:48 -08:00
Peter Simons
2bb705da15
postfix: don't create a symlink inside of /var/spool/mail if /var/mail exists already
2015-11-02 14:33:30 +01:00
Gabriel Ebner
929e734f19
postfix: 2.11.5 -> 3.0.3
2015-10-26 11:46:17 +01:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539a27ca029ee
2015-10-06 15:24:20 +02:00
Gabriel Ebner
0dfddc5a54
opensmtpd: support filters.
2015-10-02 13:01:50 +02:00
Matt McHenry
63d1ce6d38
postfix service: fix recipientDelimiter not to be dependent on sslCert
2015-09-22 21:06:32 -04:00
Florian Baumann
88a3951926
mlmmj: Fix invalid mailman entry and update transports and virtual dbs on activation
2015-09-16 09:31:38 +02:00
Edward Tjörnhammar
d3cff630ac
Merge pull request #9792 from noqqe/master
...
mlmmj: postfix master config uses deprecated nextHop instead of nexthop
2015-09-11 18:15:38 +02:00
Florian Baumann
3ea6eda04e
mlmmj: fixing reply-to field in customheaders
2015-09-11 14:28:47 +02:00
Florian Baumann
7adb779d1f
mlmmj: postfix master config uses deprecated nextHop instead of nexthop
2015-09-11 13:27:15 +02:00
Florian Baumann
935d0e858e
mlmmj: Fixed postfix config items to make module work again
2015-09-05 10:14:48 +02:00
Florian Baumann
d43496300e
fixed: mlmmj-recieve: No such file or directory
2015-08-25 15:27:58 +02:00
Nikolay Amiantov
dea8ebcfc5
dovecot: add lmtp support
2015-07-28 12:33:29 +03:00
Christoph Hrdinka
6839ad653a
postfix: fix recipient_delimiter option
...
This reverts commit 88f4b75a00
2015-06-26 14:05:53 +02:00
Peter Simons
88f4b75a00
nixos: recipientDelimiter is no longer a valid configuration option in Postfix 2.11.x or later
...
Note that this change in Postfix might affect the mlmmj.nix service in
ways I don't fully understand.
2015-06-22 12:47:23 +02:00
Peter Simons
e08074ff6d
nixos: fix code that sets up /etc/postfix
...
The sample config files have moved from ${postfix}/share to ${postfix}/etc in
version 2.11.4.
2015-06-22 12:47:23 +02:00
Eelco Dolstra
6e6a96d42c
Some more type cleanup
2015-06-15 18:18:46 +02:00
Bjørn Forsman
12e84c6378
nixos/postfix: make symlink /var/mail -> /var/spool/mail
...
This solves the problem of e.g. mutt not finding mail unless the user
sets MAIL=/var/spool/mail/$USER.
The default MAIL variable seems come from bash. Reasons for adding
symlink instead of changing MAIL default in bash:
- No need to rebuild world
- FHS recommends /var/mail over /var/spool/mail anyway[1]. Better fix
NixOS mail location than change MAIL in bash to something that doesn't
work on non-NixOS (however unlikely that users run nixpkgs bash on a
non-NixOS distro...).
[1] http://www.pathname.com/fhs/pub/fhs-2.3.html#VARMAILUSERMAILBOXFILES
2015-06-07 10:38:11 +02:00
Pascal Wittmann
40b9e938b6
postfix service: description enhancement
...
closes #7651
2015-05-06 21:53:39 +02:00
tv
86cb16965a
exim: add version 4.85 incl. nixos module
2015-02-20 10:49:15 +01:00
Andrey Arapov
04be7262a6
nixos/dovecot: added configFile option and default Restart on-failure, PR #5845
...
Absolute path is required when one has such postfix configuration
where he/she needs to specify the actual (real) path to active dovecot
config.
Without this commit applied, the dovecot is running in such way:
/nix/store/hashAAA-dovecot-ver/sbin/dovecot -F -c /nix/store/hashBBB-dovecot2.conf
and postfix can't be aware of the value of "hashBBB" via services.postfix.extraConfig = '' ... '';
(it can only be aware of "hashAAA" with ${pkgs.dovecot} parameter)
Also enable Restart on-failure.
Edit: set RestartSec to 1s
2015-01-19 11:05:56 +01:00
Jan Malakhovski
265c1c1472
postfix: make 2.11 the default, nixos: update postfix config for 2.11
...
postfix 2.11 is much more humane with respect to disk writes since it uses
sockets (which do not change inodes on accesses) instead of fifos (which do).
2015-01-07 15:43:32 +00:00
Tobias Geerinckx-Rice
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
Edward Tjörnhammar
1615be91ef
Add mlmmj package and nixos module.
2014-08-23 12:30:45 +04:00
Eelco Dolstra
29027fd1e1
Rewrite ‘with pkgs.lib’ -> ‘with lib’
...
Using pkgs.lib on the spine of module evaluation is problematic
because the pkgs argument depends on the result of module
evaluation. To prevent an infinite recursion, pkgs and some of the
modules are evaluated twice, which is inefficient. Using ‘with lib’
prevents this problem.
2014-04-14 16:26:48 +02:00
Shea Levy
2b92e90f91
opensmtpd: Add sendmail to systemPackages
2014-02-20 06:17:15 -05:00
Eelco Dolstra
862e3dd977
Substitute "types.uniq types.string" -> "types.str"
2013-10-30 14:57:42 +01:00
Eelco Dolstra
a2c820c678
Turn security.pam.services into an attribute set
...
That is, you can say
security.pam.services.sshd = { options... };
instead of
security.pam.services = [ { name = "sshd"; options... } ];
making it easier to override PAM settings from other modules.
2013-10-15 14:47:51 +02:00
Eelco Dolstra
5c1f8cbc70
Move all of NixOS to nixos/ in preparation of the repository merge
2013-10-10 13:28:20 +02:00
