diff options
| author | Robin Gloster <mail@glob.in> | 2019-09-13 13:36:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 13:36:00 +0200 |
| commit | 1987bddea844399e79258bb4acc8b4d7f8cc7258 (patch) | |
| tree | 095b0b4643c5e6aa48d73e8aea389a70b9ae9688 /nixos/modules | |
| parent | ec3898181c1bcd9b3a7cfa95cf509a84c5b4f676 (diff) | |
| parent | 4b6ba5b27c7ce81140d188d976fe1a08c3e5d3ee (diff) | |
| download | nixlib-1987bddea844399e79258bb4acc8b4d7f8cc7258.tar nixlib-1987bddea844399e79258bb4acc8b4d7f8cc7258.tar.gz nixlib-1987bddea844399e79258bb4acc8b4d7f8cc7258.tar.bz2 nixlib-1987bddea844399e79258bb4acc8b4d7f8cc7258.tar.lz nixlib-1987bddea844399e79258bb4acc8b4d7f8cc7258.tar.xz nixlib-1987bddea844399e79258bb4acc8b4d7f8cc7258.tar.zst nixlib-1987bddea844399e79258bb4acc8b4d7f8cc7258.zip | |
Merge pull request #68649 from talyz/gitlab-fix
nixos/gitlab: Fix swap of secrets
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index caef4ad4ea80..bcf0603c6f39 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -806,8 +806,8 @@ in { export otp="$(<'${cfg.secrets.otpFile}')" export jws="$(<'${cfg.secrets.jwsFile}')" ${pkgs.jq}/bin/jq -n '{production: {secret_key_base: $ENV.secret, - otp_key_base: $ENV.db, - db_key_base: $ENV.otp, + otp_key_base: $ENV.otp, + db_key_base: $ENV.db, openid_connect_signing_key: $ENV.jws}}' \ > '${cfg.statePath}/config/secrets.yml' ) |