diff options
| author | Robin Gloster <mail@glob.in> | 2019-07-16 03:42:45 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-07-16 03:51:11 +0200 |
| commit | 3469c206f2b895ff7f6cacd7d3d08cf0b70c41d3 (patch) | |
| tree | fd01eb99234f0fa1d3477929de1f474afa495db3 /nixos/modules/services/misc | |
| parent | 9f77b4a59955b94d487787b69cd284ea55514725 (diff) | |
| download | nixpkgs-3469c206f2b895ff7f6cacd7d3d08cf0b70c41d3.tar nixpkgs-3469c206f2b895ff7f6cacd7d3d08cf0b70c41d3.tar.gz nixpkgs-3469c206f2b895ff7f6cacd7d3d08cf0b70c41d3.tar.bz2 nixpkgs-3469c206f2b895ff7f6cacd7d3d08cf0b70c41d3.tar.lz nixpkgs-3469c206f2b895ff7f6cacd7d3d08cf0b70c41d3.tar.xz nixpkgs-3469c206f2b895ff7f6cacd7d3d08cf0b70c41d3.tar.zst nixpkgs-3469c206f2b895ff7f6cacd7d3d08cf0b70c41d3.zip | |
gitlab-shell: better gitlab_shell_secret location
So this won't be cleaned up by removing config/*
Diffstat (limited to 'nixos/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 488d94c5c0f..4810e993ba2 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -52,7 +52,7 @@ let gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}"; http_settings.self_signed_cert = false; repos_path = "${cfg.statePath}/repositories"; - secret_file = "${cfg.statePath}/config/gitlab_shell_secret"; + secret_file = "${cfg.statePath}/gitlab_shell_secret"; log_file = "${cfg.statePath}/log/gitlab-shell.log"; custom_hooks_dir = "${cfg.statePath}/custom_hooks"; redis = { @@ -109,7 +109,7 @@ let gitlab_shell = { path = "${cfg.packages.gitlab-shell}"; hooks_path = "${cfg.statePath}/shell/hooks"; - secret_file = "${cfg.statePath}/config/gitlab_shell_secret"; + secret_file = "${cfg.statePath}/gitlab_shell_secret"; upload_pack = true; receive_pack = true; }; @@ -132,14 +132,9 @@ let HOME = "${cfg.statePath}/home"; UNICORN_PATH = "${cfg.statePath}/"; GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; - GITLAB_STATE_PATH = cfg.statePath; - GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads"; SCHEMA = "${cfg.statePath}/db/schema.rb"; + 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}/shell/config.yml"; - GITLAB_SHELL_SECRET_PATH = "${cfg.statePath}/config/gitlab_shell_secret"; - GITLAB_SHELL_HOOKS_PATH = "${cfg.statePath}/shell/hooks"; GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "redis.yml" (builtins.toJSON redisConfig); prometheus_multiproc_dir = "/run/gitlab"; RAILS_ENV = "production"; @@ -634,7 +629,7 @@ in { ${pkgs.sudo}/bin/sudo -u ${cfg.user} cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db ${pkgs.sudo}/bin/sudo -u ${cfg.user} chmod u+w ${cfg.statePath}/db/* - ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret + ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${cfg.packages.gitlab-shell}/bin/install |