Merge pull request #113635 from talyz/gitlab-improvements

nixos/gitlab: Clean config dir, switch to puma, split PreStart script and more
NixOS · Mar 1, 2021 · e723754 · e723754
2 parents dea1d79 + ca725e7
commit e723754
Show file tree

Hide file tree

Showing 6 changed files with 322 additions and 227 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml
@@ -523,6 +523,13 @@ self: super:
       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.
     </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>
     <para>

diff --git a/nixos/modules/services/misc/defaultUnicornConfig.rb b/nixos/modules/services/misc/defaultUnicornConfig.rb