diff options
| author | Robin Gloster <mail@glob.in> | 2017-09-12 08:21:23 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-20 23:51:26 +0200 |
| commit | 370ac6275ebcbc3064b3079c3435bf3aaf02e677 (patch) | |
| tree | 773d3dc739ac260652ee7c15fee998005bbf4712 /nixos | |
| parent | 408734441b0b6aaafacaaaee96e42eceb957d591 (diff) | |
| download | nixlib-370ac6275ebcbc3064b3079c3435bf3aaf02e677.tar nixlib-370ac6275ebcbc3064b3079c3435bf3aaf02e677.tar.gz nixlib-370ac6275ebcbc3064b3079c3435bf3aaf02e677.tar.bz2 nixlib-370ac6275ebcbc3064b3079c3435bf3aaf02e677.tar.lz nixlib-370ac6275ebcbc3064b3079c3435bf3aaf02e677.tar.xz nixlib-370ac6275ebcbc3064b3079c3435bf3aaf02e677.tar.zst nixlib-370ac6275ebcbc3064b3079c3435bf3aaf02e677.zip | |
gitlab module: fix shell hook path
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 412355fb35b5..7bf18d481504 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -142,9 +142,9 @@ let GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads"; GITLAB_LOG_PATH = "${cfg.statePath}/log"; GITLAB_SHELL_PATH = "${cfg.packages.gitlab-shell}"; - GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/home/config.yml"; + GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml"; GITLAB_SHELL_SECRET_PATH = "${cfg.statePath}/config/gitlab_shell_secret"; - GITLAB_SHELL_HOOKS_PATH = "${cfg.statePath}/home/hooks"; + GITLAB_SHELL_HOOKS_PATH = "${cfg.statePath}/shell/hooks"; GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "gitlab-redis.yml" redisYml; prometheus_multiproc_dir = "/run/gitlab"; RAILS_ENV = "production"; @@ -567,7 +567,7 @@ in { mkdir -p ${cfg.statePath}/tmp/pids mkdir -p ${cfg.statePath}/tmp/sockets - rm -rf ${cfg.statePath}/config ${cfg.statePath}/home/hooks + rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks mkdir -p ${cfg.statePath}/config tr -dc A-Za-z0-9 < /dev/urandom | head -c 32 > ${cfg.statePath}/config/gitlab_shell_secret |