diff options
| author | Kristoffer Thømt Ravneberg <ktra@dbc.dk> | 2018-09-21 09:41:38 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-09-25 03:53:32 +0200 |
| commit | f17f59ca8e5cecdeea51381f9249bf979bf4ea66 (patch) | |
| tree | df5fb0ee843b934351bd3cad0d345aa359a6a802 /nixos | |
| parent | 6946d97ce4060f0e4067d332eca1a57672bf7448 (diff) | |
| download | nixlib-f17f59ca8e5cecdeea51381f9249bf979bf4ea66.tar nixlib-f17f59ca8e5cecdeea51381f9249bf979bf4ea66.tar.gz nixlib-f17f59ca8e5cecdeea51381f9249bf979bf4ea66.tar.bz2 nixlib-f17f59ca8e5cecdeea51381f9249bf979bf4ea66.tar.lz nixlib-f17f59ca8e5cecdeea51381f9249bf979bf4ea66.tar.xz nixlib-f17f59ca8e5cecdeea51381f9249bf979bf4ea66.tar.zst nixlib-f17f59ca8e5cecdeea51381f9249bf979bf4ea66.zip | |
nixos/gitlab: avoid creating recursive symlinks, add gitlab-rake deps
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 5bf66354f487..6031a2316094 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -162,7 +162,7 @@ let makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \ - --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package ]}:$PATH' \ + --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package pkgs.coreutils pkgs.procps ]}:$PATH' \ --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \ --run 'cd ${cfg.packages.gitlab}/share/gitlab' ''; @@ -203,6 +203,7 @@ in { default = pkgs.gitlab; defaultText = "pkgs.gitlab"; description = "Reference to the gitlab package"; + example = "pkgs.gitlab-ee"; }; packages.gitlab-shell = mkOption { @@ -569,9 +570,9 @@ in { mkdir -p /run/gitlab mkdir -p ${cfg.statePath}/log - ln -sf ${cfg.statePath}/log /run/gitlab/log - ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp - ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads + [ -d /run/gitlab/log ] || ln -sf ${cfg.statePath}/log /run/gitlab/log + [ -d /run/gitlab/tmp ] || ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp + [ -d /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml chown -R ${cfg.user}:${cfg.group} /run/gitlab |