summary refs log tree commit diff
diff options
context:
space:
mode:
authorTom Siewert <tom@siewert.io>2023-06-04 02:32:35 +0200
committerGitHub <noreply@github.com>2023-06-04 02:32:35 +0200
commit50d66bcba638b527a02a4aee21fb91e6f5f1eb67 (patch)
treef1f4d2044512dd20c6f74d599caae4daae33d1ba
parentdd4982554e18b936790da07c4ea2db7c7600f283 (diff)
downloadnixpkgs-50d66bcba638b527a02a4aee21fb91e6f5f1eb67.tar
nixpkgs-50d66bcba638b527a02a4aee21fb91e6f5f1eb67.tar.gz
nixpkgs-50d66bcba638b527a02a4aee21fb91e6f5f1eb67.tar.bz2
nixpkgs-50d66bcba638b527a02a4aee21fb91e6f5f1eb67.tar.lz
nixpkgs-50d66bcba638b527a02a4aee21fb91e6f5f1eb67.tar.xz
nixpkgs-50d66bcba638b527a02a4aee21fb91e6f5f1eb67.tar.zst
nixpkgs-50d66bcba638b527a02a4aee21fb91e6f5f1eb67.zip
nixos/gitlab: Fix config reference for registry (#235639)
Support for gitlab-container-registry has been added in 014816cbe469.
However, when enabling the registry it will throw an error as it can't
find a `package` attribute.

This commit fixes the registry configuration by adding the missing
`registry` part.
-rw-r--r--nixos/modules/services/misc/gitlab.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index bf0a1200744..9c18a2eed1c 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -1231,7 +1231,7 @@ in {
     services.dockerRegistry = optionalAttrs cfg.registry.enable {
       enable = true;
       enableDelete = true; # This must be true, otherwise GitLab won't manage it correctly
-      package = cfg.package;
+      package = cfg.registry.package;
       extraConfig = {
         auth.token = {
           realm = "http${optionalString (cfg.https == true) "s"}://${cfg.host}/jwt/auth";