chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 04:19:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

services.redis: fix

Browse Source
This commit is contained in:
陈浩南
2024-05-30 13:04:39 +08:00
parent f97fad608d
commit ddd4cd667d
3 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/services/misskey.nix
View File

@@ -136,9 +136,9 @@ inputs:
(attrsToList misskey.instances));
nixos.services =
{
redis = mkIf (misskey.instances != {}) { instances = listToAttrs (map
redis.instances = listToAttrs (map
(instance: { name = "misskey-${instance.name}"; value.port = instance.value.redis.port; })
(attrsToList misskey.instances)); };
(attrsToList misskey.instances));
postgresql.instances = listToAttrs (map
(instance: { name = "misskey_${replaceStrings [ "-" ] [ "_" ] instance.name}"; value = {}; })
(attrsToList misskey.instances));

51
modules/services/redis.nix
View File

@@ -13,33 +13,28 @@ inputs:
default = {};
};
};
config =
let
inherit (inputs.config.nixos.services) redis;
inherit (inputs.localLib) attrsToList;
inherit (builtins) map listToAttrs filter;
in
{
services.redis.servers = listToAttrs (map
(server:
config = let inherit (inputs.config.nixos.services) redis; in
{
services.redis.servers = inputs.localLib.listToAttrs (builtins.map
(server:
{
inherit (server) name;
value =
{
inherit (server) name;
value =
{
enable = true;
bind = null;
port = server.value.port;
user = server.value.user;
# unixSocket = null; # bug
unixSocketPerm = 600;
requirePassFile =
if server.value.passwordFile == null then inputs.config.sops.secrets."redis/${server.name}".path
else server.value.passwordFile;
};
})
(attrsToList redis.instances));
sops.secrets = listToAttrs (map
(server: { name = "redis/${server.name}"; value.owner = inputs.config.users.users.${server.value.user}.name; })
(filter (server: server.value.passwordFile == null) (attrsToList redis.instances)));
};
enable = true;
bind = null;
port = server.value.port;
user = server.value.user;
# unixSocket = null; # bug
unixSocketPerm = 600;
requirePassFile =
if server.value.passwordFile == null then inputs.config.sops.secrets."redis/${server.name}".path
else server.value.passwordFile;
};
})
(builtins.attrsToList redis.instances));
sops.secrets = inputs.localLib.listToAttrs (builtins.map
(server: { name = "redis/${server.name}"; value.owner = inputs.config.users.users.${server.value.user}.name; })
(builtins.filter (server: server.value.passwordFile == null) (builtins.attrsToList redis.instances)));
};
}

4
modules/services/synapse.nix
View File

@@ -271,9 +271,9 @@ inputs:
}
])
(attrsToList synapse.instances)));
redis = mkIf (synapse.instances != {}) { instances = listToAttrs (map
redis.instances = listToAttrs (map
(instance: { name = "synapse-${instance.name}"; value.port = instance.value.redisPort; })
(attrsToList synapse.instances));};
(attrsToList synapse.instances));
nginx =
{
enable = mkIf (synapse.instances != {}) true;