diff options
| author | WilliButz <willibutz@posteo.de> | 2022-07-04 19:31:16 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-09-01 22:21:37 +0000 |
| commit | f4c64b6d1c1dfe5758d70b5394bc959db8b30134 (patch) | |
| tree | 6bf14bd05762768e421f43b1e9a1d2fdb1de67fc | |
| parent | Merge pull request #189348 from NixOS/backport-189302-to-release-22.05 (diff) | |
| download | nixpkgs-origin/backport-180149-to-release-22.05.tar.gz | |
nixos/gitlab: fix registry.issuer settingorigin/backport-180149-to-release-22.05
Prior to this change, the configuration value for
`services.gitlab.registry.issuer` was only referenced by the
docker-registry configuration and in the `gitlab-registry-cert` service
while the gitlab config used the hard-coded value "gitlab-issuer".
(cherry picked from commit e2a322b3cdd8e851c6c9f9c744e307a2b9a1ce33)
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 77556bfe0070..7d535dc9ead8 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -168,7 +168,7 @@ let port = cfg.registry.externalPort; key = cfg.registry.keyFile; api_url = "http://${config.services.dockerRegistry.listenAddress}:${toString config.services.dockerRegistry.port}/"; - issuer = "gitlab-issuer"; + issuer = cfg.registry.issuer; }; extra = {}; uploads.storage_path = cfg.statePath; |