nixos/gitlab: Fix databaseCreateLocally evaluation and operation #69344
+18
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
config.services.postgresql.package is only defined when the postgresql service is activated, which means we fail to evaluate when databaseCreateLocally == false. Fix this by using the default postgresql package when the postgresql service is disabled.
Make sure that we don't create a database if we're not going to connect to it. Also, fix the assertion that usernames be equal to only trig when peer authentication is used (databaseHost == "").
talyz
force-pushed
the
gitlab-create-database
branch
from
d99b88a to
58a7502
Compare
ofborg
bot
added
6.topic: nixos
|
Can this be merged? @globin |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Currently, as long as the
services.gitlab.databaseCreateLocallyoption is set totrue, the default, we create a local database, even if theservices.gitlab.databaseHostoption is set, indicating that we're not going to connect to the local database. We also assert thatservices.gitlab.userandservices.gitlab.databaseUsernameare equal, which in actuality only matters whenservices.gitlab.databaseHostis set to its default value"". This issue was raised in #68841.Even worse, setting
services.gitlab.databaseCreateLocallytofalseresults in an evaluation failure unlessservices.postgresql.enableis set totrueeither manually or by another module.This fixes both of these issues and needs to be ported to 19.09.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @aanderse @flokli @globin @mawis