diff options
| author | Yaya <mak@nyantec.com> | 2023-05-20 17:59:37 +0000 |
|---|---|---|
| committer | Yureka <yuka@yuka.dev> | 2023-05-31 22:14:25 +0200 |
| commit | 33411f27686e7535254879c0fddaa93a67ea4774 (patch) | |
| tree | b2fccb6cc77fcc7f369badfcb8c998e8abac9609 /nixos/modules/services | |
| parent | a69b300bc1b7e4d8cee982d0f8d65d134b6d58e0 (diff) | |
| download | nixlib-33411f27686e7535254879c0fddaa93a67ea4774.tar nixlib-33411f27686e7535254879c0fddaa93a67ea4774.tar.gz nixlib-33411f27686e7535254879c0fddaa93a67ea4774.tar.bz2 nixlib-33411f27686e7535254879c0fddaa93a67ea4774.tar.lz nixlib-33411f27686e7535254879c0fddaa93a67ea4774.tar.xz nixlib-33411f27686e7535254879c0fddaa93a67ea4774.tar.zst nixlib-33411f27686e7535254879c0fddaa93a67ea4774.zip | |
nixos/gitlab: Update redis configuration
Configuring Redis via environment variable is not supported anymore since [1]. [1] https://gitlab.com/gitlab-org/gitlab/-/commit/12429653611af05ef960689c8971108d5a85c937
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e8b6ae16c50d..10eb175fb7c9 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -84,6 +84,9 @@ let }; }; + # Redis configuration file + resqueYml = pkgs.writeText "resque.yml" (builtins.toJSON redisConfig); + gitlabConfig = { # These are the default settings from config/gitlab.example.yml production = flip recursiveUpdate cfg.extraConfig { @@ -167,7 +170,6 @@ let SCHEMA = "${cfg.statePath}/db/structure.sql"; GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads"; GITLAB_LOG_PATH = "${cfg.statePath}/log"; - GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "redis.yml" (builtins.toJSON redisConfig); prometheus_multiproc_dir = "/run/gitlab"; RAILS_ENV = "production"; MALLOC_ARENA_MAX = "2"; @@ -1310,6 +1312,7 @@ in { cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb ln -sf ${cableYml} ${cfg.statePath}/config/cable.yml + ln -sf ${resqueYml} ${cfg.statePath}/config/resque.yml ${cfg.packages.gitlab-shell}/bin/install |