Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/gitlab: Add a second database connection #305764

Merged

Conversation

yayayayaka
Copy link
Member

This is a followup on #274518.

GitLab deprecated single database connections in 15.9.
From GitLab 17.0 onward it will be mandatory to define both main and
ci sections in the database.yml, as explained in the manual.

This Pull Request updates the module to address the upcoming breaking change.

Thanks to @tomsiewert for the first draft and @dasJ for sharing their jq snippet.

Description of changes

  • Renames services.postgresql.port setting to postgresql.settings.port
  • Updates the database config for compatibility with GitLab 17.0

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 馃憤 reaction to pull requests you find important.

GitLab deprecated single database connections in 15.9. [1]
From GitLab 17.0 onward it will be mandatory to define both `main` and
`ci` sections in the `database.yml`. [2]

This commit updates the module to address the upcoming breaking change.

[1]: https://gitlab.com/gitlab-org/gitlab/-/issues/387898
[2]: https://docs.gitlab.com/16.10/ee/install/installation.html#configure-gitlab-db-settings
@nbraud
Copy link
Contributor

nbraud commented May 2, 2024

@ofborg test gitlab

@nbraud nbraud merged commit 1207b23 into NixOS:master May 2, 2024
29 of 30 checks passed
@yayayayaka yayayayaka deleted the gitlab-add-second-database-connection branch May 3, 2024 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants