Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 365ca1112115
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ac29e16aee74
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 28, 2020

  1. nixos/gitlab: Fix services.gitlab.enableStartTLSAuto 

    'toString false' results in an empty string, which, in this context,
is a syntax error. Use boolToString instead.

Fixes #86160

(cherry picked from commit c0a838d)
    @talyz
    talyz committed Apr 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    talyz Kim Lindberger
    GPG key ID: 2DED2151F4671A2B
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5a52738 View commit details

  2. Merge pull request #86190 from talyz/release-20.03 

    [20.03] nixos/gitlab: Fix services.gitlab.enableStartTLSAuto
    @talyz
    talyz authored Apr 28, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ac29e16 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/misc/gitlab.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -180,7 +180,7 @@ let
${optionalString (cfg.smtp.passwordFile != null) ''password: "@smtpPassword@",''}
domain: "${cfg.smtp.domain}",
${optionalString (cfg.smtp.authentication != null) "authentication: :${cfg.smtp.authentication},"}
enable_starttls_auto: ${toString cfg.smtp.enableStartTLSAuto},
enable_starttls_auto: ${boolToString cfg.smtp.enableStartTLSAuto},
ca_file: "/etc/ssl/certs/ca-certificates.crt",
openssl_verify_mode: '${cfg.smtp.opensslVerifyMode}'
}