about summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2020-05-31 06:21:09 +0200
committertalyz <kim.lindberger@gmail.com>2020-06-04 14:32:39 +0200
commit79454f15acfc05d57d4a8d0cd01384fc103db596 (patch)
treef86bc7780f14522edb6dabcc699fadc07bcafa35 /nixos/modules/services
parent3327b9a385f5ec2e219bf93b48896772b3f66afc (diff)
downloadnixlib-79454f15acfc05d57d4a8d0cd01384fc103db596.tar
nixlib-79454f15acfc05d57d4a8d0cd01384fc103db596.tar.gz
nixlib-79454f15acfc05d57d4a8d0cd01384fc103db596.tar.bz2
nixlib-79454f15acfc05d57d4a8d0cd01384fc103db596.tar.lz
nixlib-79454f15acfc05d57d4a8d0cd01384fc103db596.tar.xz
nixlib-79454f15acfc05d57d4a8d0cd01384fc103db596.tar.zst
nixlib-79454f15acfc05d57d4a8d0cd01384fc103db596.zip
gitlab: 12.10.8 -> 13.0.3
https://about.gitlab.com/releases/2020/05/22/gitlab-13-0-released/
https://about.gitlab.com/releases/2020/05/27/security-release-13-0-1-released/
https://about.gitlab.com/releases/2020/05/29/gitlab-13-0-3-released/

The gitaly gitlab-shell config has moved into gitaly.toml. See
https://gitlab.com/gitlab-org/gitaly/-/issues/2182 for more info.
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/misc/gitlab.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 7b2bbf89a446..1ada131bd7ba 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -43,6 +43,9 @@ let
 
     [gitlab-shell]
     dir = "${cfg.packages.gitlab-shell}"
+    secret_file = "${cfg.statePath}/gitlab_shell_secret"
+    gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}"
+    http_settings = { self_signed_cert = false }
 
     ${concatStringsSep "\n" (attrValues (mapAttrs (k: v: ''
     [[storage]]