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

nixos/gitlab: Change default SMTP port, enable postfix only if used

Browse source 
Change the default SMTP port to `25`, to better match the default
address `localhost`. This gets rid of some error outputs in the test,
where it fails to connect to localhost:465.

Also, don't enable postfix by default unless it's actually useful to
us.
This commit is contained in:
talyz 2021-02-18 17:26:20 +01:00
parent f8ab43ef7b
commit 2b3800b9c7
No known key found for this signature in database
GPG key ID: 2DED2151F4671A2B
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nixos/doc/manual/release-notes/rl-2105.xml
View file

@ -523,6 +523,13 @@ self: super:
as an hardware RNG, as it will automatically run the krngd task to periodically collect random as an hardware RNG, as it will automatically run the krngd task to periodically collect random
data from the device and mix it into the kernel's RNG. data from the device and mix it into the kernel's RNG.
</para> </para>
<para>
The default SMTP port for GitLab has been changed to
<literal>25</literal> from its previous default of
<literal>465</literal>. If you depended on this default, you
should now set the <xref linkend="opt-services.gitlab.smtp.port" />
option.
</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>

4
nixos/modules/services/misc/gitlab.nix
View file

@ -424,7 +424,7 @@ in {
port = mkOption { port = mkOption {
type = types.int; type = types.int;
default = 465; default = 25;
description = "Port of the SMTP server for Gitlab."; description = "Port of the SMTP server for Gitlab.";
}; };
@ -684,7 +684,7 @@ in {
}; };
# Use postfix to send out mails. # Use postfix to send out mails.
services.postfix.enable = mkDefault true; services.postfix.enable = mkDefault (cfg.smtp.enable && cfg.smtp.address == "localhost");
users.users.${cfg.user} = users.users.${cfg.user} =
{ group = cfg.group; { group = cfg.group;