summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-07-22 19:05:28 +0200
committerGitHub <noreply@github.com>2020-07-22 19:05:28 +0200
commit80c2d2e2afd7330632ce76038c8dd7a6af185161 (patch)
treee8a49860bee264d459c384d496f2e5982246c429 /nixos
parent5c56778efdcaa1b8088eb536c3f1e9cc110930dc (diff)
parente9bf4ca80f55f33ad951e12c4eddb90d61afc1e7 (diff)
Merge pull request #93423 from helsinki-systems/feat/gitlab-redis-url
nixos/gitlab: Make redis URL configurable
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/misc/gitlab.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 994c41e8872b3..be59b53e5ce02 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -71,7 +71,7 @@ let
     };
   };
 
-  redisConfig.production.url = "redis://localhost:6379/";
+  redisConfig.production.url = cfg.redisUrl;
 
   gitlabConfig = {
     # These are the default settings from config/gitlab.example.yml
@@ -311,6 +311,12 @@ in {
         description = "Extra configuration in config/database.yml.";
       };
 
+      redisUrl = mkOption {
+        type = types.str;
+        default = "redis://localhost:6379/";
+        description = "Redis URL for all GitLab services except gitlab-shell";
+      };
+
       extraGitlabRb = mkOption {
         type = types.str;
         default = "";