Move secrets to flakes

[perso/Immae/Config/Nix.git] / modules / private / databases / redis_replication.nix

diff --git a/modules/private/databases/redis_replication.nix b/modules/private/databases/redis_replication.nix
index cc626f56b7d8db6cdb0275eaf1b2dadc0bfaa203..3caa7e95af413fac62b330428fd8c7a1a500657c 100644 (file)
--- a/modules/private/databases/redis_replication.nix
+++ b/modules/private/databases/redis_replication.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, myconfig, lib, ... }:
+{ pkgs, config, lib, ... }:
 let
   cfg = config.myServices.databasesReplication.redis;
 in
@@ -63,8 +63,8 @@ in
       config.redis = {
         encrypt = true;
         source = "127.0.0.1:16379";
-        target = "${myconfig.env.servers.eldiron.ips.main.ip4}:16379";
-        keyfile = "${config.secrets.location}/redis/spiped_eldiron_keyfile";
+        target = "${config.myEnv.servers.eldiron.ips.main.ip4}:16379";
+        keyfile = config.secrets.fullPaths."redis/spiped_eldiron_keyfile";
       };
     };
 
@@ -103,7 +103,7 @@ in
         user = "spiped";
         group = "spiped";
         permissions = "0400";
-        text = myconfig.env.databases.redis.spiped_key;
+        text = config.myEnv.databases.redis.spiped_key;
       }
     ];
 
@@ -117,7 +117,7 @@ in
               #!${pkgs.stdenv.shell}
 
               ${pkgs.coreutils}/bin/cp ${cfg.base}/${name}/redis/dump.rdb \
-                ${backupDir}/$(${pkgs.coreutils}/bin/date -Iseconds).rdb
+                ${backupDir}/$(${pkgs.coreutils}/bin/date -Iminutes).rdb
             '';
           u = pkgs.callPackage ./utils.nix {};
           cleanup_script = pkgs.writeScript "cleanup_redis_${name}" (u.exponentialDumps "rdb" backupDir);
@@ -162,7 +162,7 @@ in
         unitConfig.RequiresMountsFor = dataDir;
 
         serviceConfig = {
-          ExecStart = "${hcfg.package}/bin/redis-server ${config.secrets.location}/redis_replication/${name}/config";
+          ExecStart = "${hcfg.package}/bin/redis-server ${config.secrets.fullPaths."redis_replication/${name}/config"}";
           User = "redis";
           RuntimeDirectory = "redis_${name}";
         };