From 29bc446b5c6942d4f613ab78aa8166e389d148cd Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 12 Jan 2024 02:00:49 +0100 Subject: [PATCH] Revert "nixos/gitlab: fix database config when no passwordfile is defined" (#280392) --- nixos/modules/services/misc/gitlab.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index d8e4aab4feea..ca6910b795d8 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1359,7 +1359,6 @@ in { '' else '' jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ - '${if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.9" then ".production.main as $main | del(.production.main) | .production |= {main: $main} + ." else ""}' \ >'${cfg.statePath}/config/database.yml' '' }