public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/gitlab: add changes for gitlab 13.4.x

Browse Source
This commit is contained in:
Jeff Slight 2020-09-28 17:41:25 -07:00 committed by Milan Pässler
parent c16a977386
commit f98a6322e6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/misc/gitlab.nix
View File

@ -43,9 +43,13 @@ let
[gitlab-shell] [gitlab-shell]
dir = "${cfg.packages.gitlab-shell}" dir = "${cfg.packages.gitlab-shell}"
[gitlab]
secret_file = "${cfg.statePath}/gitlab_shell_secret" secret_file = "${cfg.statePath}/gitlab_shell_secret"
gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}" url = "http+unix://${pathUrlQuote gitlabSocket}"
http_settings = { self_signed_cert = false }
[gitlab.http-settings]
self_signed_cert = false
${concatStringsSep "\n" (attrValues (mapAttrs (k: v: '' ${concatStringsSep "\n" (attrValues (mapAttrs (k: v: ''
[[storage]] [[storage]]
@ -119,6 +123,7 @@ let
receive_pack = true; receive_pack = true;
}; };
workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret"; workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
gitlab_kas.secret_file = "${cfg.statePath}/.gitlab_kas_secret";
git.bin_path = "git"; git.bin_path = "git";
monitoring = { monitoring = {
ip_whitelist = [ "127.0.0.0/8" "::1/128" ]; ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
@ -668,6 +673,7 @@ in {
rm "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" rm "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}"
fi fi
$PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm" $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm"
$PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS btree_gist;"
''; '';
serviceConfig = { serviceConfig = {