about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorYureka <yuka@yuka.dev>2024-01-12 02:00:49 +0100
committerGitHub <noreply@github.com>2024-01-12 02:00:49 +0100
commit29bc446b5c6942d4f613ab78aa8166e389d148cd (patch)
tree2c98eb3bafd62d810b1321cef48321496c18dc29 /nixos
parent31c0f018ec7f91ef48d00aa3bb8611117b3f1510 (diff)
Revert "nixos/gitlab: fix database config when no passwordfile is defined" (#280392)
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/misc/gitlab.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index d8e4aab4feea5..ca6910b795d8f 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'
               ''
             }