From b0781dbc85da7bba5a3a9209ca4d3b3900eea7b5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 24 Jan 2019 18:10:20 +0100
Subject: [PATCH] Make redis connections abstract

---
 virtual/modules/databases/default.nix                 | 11 +++--------
 virtual/modules/websites/tools/cloud/nextcloud.nix    |  4 ++--
 virtual/modules/websites/tools/diaspora/diaspora.nix  |  2 +-
 virtual/modules/websites/tools/mastodon/mastodon.nix  |  6 +++---
 .../websites/tools/mediagoblin/mediagoblin.nix        |  4 ++--
 virtual/modules/websites/tools/tools/wallabag.nix     |  8 ++++----
 6 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/virtual/modules/databases/default.nix b/virtual/modules/databases/default.nix
index 0912830..430d032 100644
--- a/virtual/modules/databases/default.nix
+++ b/virtual/modules/databases/default.nix
@@ -151,23 +151,18 @@ in {
       }
     ];
 
-    # Diaspora: 15
-    # Nextcloud: 14
-    # Mastodon: 13
-    # Mediagoblin: 12
-    # wallabag: 0 ?
     services.redis = rec {
       enable = config.services.myDatabases.redis.enable;
       bind = "127.0.0.1";
-      unixSocket = "/run/redis/redis.sock";
+      unixSocket = myconfig.env.databases.redis.socket;
       extraConfig = ''
         unixsocketperm 777
         maxclients 1024
         '';
     };
     system.activationScripts.redis = ''
-      mkdir -p /run/redis
-      chown redis /run/redis
+      mkdir -p $(dirname ${myconfig.env.databases.redis.socket})
+      chown redis $(dirname ${myconfig.env.databases.redis.socket})
     '';
   };
 }
diff --git a/virtual/modules/websites/tools/cloud/nextcloud.nix b/virtual/modules/websites/tools/cloud/nextcloud.nix
index 815254b..1cd7b90 100644
--- a/virtual/modules/websites/tools/cloud/nextcloud.nix
+++ b/virtual/modules/websites/tools/cloud/nextcloud.nix
@@ -138,8 +138,8 @@ let
         'filelocking.enabled' => true,
         'redis' =>
         array (
-          'host' => 'localhost',
-          'port' => 6379,
+          'host' => '${env.redis.socket}',
+          'port' => 0,
           'dbindex' => ${env.redis.db_index},
         ),
         'overwrite.cli.url' => 'https://cloud.immae.eu',
diff --git a/virtual/modules/websites/tools/diaspora/diaspora.nix b/virtual/modules/websites/tools/diaspora/diaspora.nix
index be3e426..798ebe6 100644
--- a/virtual/modules/websites/tools/diaspora/diaspora.nix
+++ b/virtual/modules/websites/tools/diaspora/diaspora.nix
@@ -28,7 +28,7 @@ let
         environment:
           url: "https://diaspora.immae.eu/"
           certificate_authorities: '${cacert}/etc/ssl/certs/ca-bundle.crt'
-          redis: 'redis://localhost:6379/15'
+          redis: '${env.redis_url}'
           sidekiq:
           s3:
           assets:
diff --git a/virtual/modules/websites/tools/mastodon/mastodon.nix b/virtual/modules/websites/tools/mastodon/mastodon.nix
index cb8bfc8..e6b396b 100644
--- a/virtual/modules/websites/tools/mastodon/mastodon.nix
+++ b/virtual/modules/websites/tools/mastodon/mastodon.nix
@@ -64,9 +64,9 @@ let
     buildInputs = [ yarnModules gems ];
   });
   config = writeText "mastodon_environment" ''
-    REDIS_HOST=localhost
-    REDIS_PORT=6379
-    REDIS_DB=13
+    REDIS_HOST=${env.redis.host}
+    REDIS_PORT=${env.redis.port}
+    REDIS_DB=${env.redis.db}
     DB_HOST=/run/postgresql
     DB_USER=mastodon
     DB_NAME=mastodon
diff --git a/virtual/modules/websites/tools/mediagoblin/mediagoblin.nix b/virtual/modules/websites/tools/mediagoblin/mediagoblin.nix
index 54470a4..cad6225 100644
--- a/virtual/modules/websites/tools/mediagoblin/mediagoblin.nix
+++ b/virtual/modules/websites/tools/mediagoblin/mediagoblin.nix
@@ -225,8 +225,8 @@ in
       base_url = /mgoblin_media/
 
       [celery]
-      CELERY_RESULT_DBURI = redis+socket:///run/redis/redis.sock?virtual_host=12
-      BROKER_URL = redis+socket:///run/redis/redis.sock?virtual_host=12
+      CELERY_RESULT_DBURI = ${env.redis_url}
+      BROKER_URL = ${env.redis_url}
       CELERYD_CONCURRENCY = 1
 
       [plugins]
diff --git a/virtual/modules/websites/tools/tools/wallabag.nix b/virtual/modules/websites/tools/tools/wallabag.nix
index d6eb95a..e708e8c 100644
--- a/virtual/modules/websites/tools/tools/wallabag.nix
+++ b/virtual/modules/websites/tools/tools/wallabag.nix
@@ -34,10 +34,10 @@ let
           rabbitmq_user: guest
           rabbitmq_password: guest
           rabbitmq_prefetch_count: 10
-          redis_scheme: tcp
-          redis_host: localhost
-          redis_port: 6379
-          redis_path: null
+          redis_scheme: unix
+          redis_host: null
+          redis_port: null
+          redis_path: ${env.redis.socket}
           redis_password: null
           sites_credentials: {  }
           ldap_enabled: true
-- 
2.41.0