chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2024-10-23 08:29:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix meilisearch

Browse Source
This commit is contained in:
陈浩南 2023-08-26 13:47:45 +08:00
parent dce8fe8cda
commit fd0c285a47
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/services/meilisearch.nix
View File

@ -15,10 +15,9 @@ inputs:
config =
let
inherit (inputs.config.nixos.services) meilisearch;
inherit (inputs.lib) mkMerge mkAfter concatStringsSep mkIf;
inherit (inputs.localLib) stripeTabs attrsToList;
inherit (builtins) map listToAttrs filter;
in mkIf meilisearch.enable
inherit (builtins) map listToAttrs;
in
{
systemd.services = listToAttrs (map
(instance:
@ -31,10 +30,10 @@ inputs:
after = [ "network.target" ];
serviceConfig =
{
User = instance.user;
Group = inputs.users.users.${instance.user}.group;
User = instance.value.user;
Group = inputs.config.users.users.${instance.value.user}.group;
ExecStart = "${inputs.pkgs.meilisearch}/bin/meilisearch"
+ " --config-file-path ${inputs.sops.template."meilisearch-${instance.name}.toml".path}";
+ " --config-file-path ${inputs.config.sops.templates."meilisearch-${instance.name}.toml".path}";
StateDirectory = "meilisearch/${instance.name}";
};
};
@ -42,7 +41,7 @@ inputs:
(attrsToList meilisearch.instances));
sops =
{
template = listToAttrs (map
templates = listToAttrs (map
(instance:
{
name = "meilisearch-${instance.name}.toml";
@ -50,14 +49,13 @@ inputs:
{
content = stripeTabs
''
db_path = "/var/lib/meilisearch/${instance.name}";
http_addr = "0.0.0.0:${toString instance.port}";
master_key = "${inputs.sops.placeholder."meilisearch/${instance.name}"}";
no_analytics = false;
env = "production";
dump_dir = "/var/lib/meilisearch/${instance.name}/dumps";
log_level = "info";
max_indexing_memory = 1Gb;
db_path = "/var/lib/meilisearch/${instance.name}"
http_addr = "0.0.0.0:${toString instance.value.port}"
master_key = "${inputs.config.sops.placeholder."meilisearch/${instance.name}"}"
env = "production"
dump_dir = "/var/lib/meilisearch/${instance.name}/dumps"
log_level = "INFO"
max_indexing_memory = "1Gb"
'';
owner = inputs.config.users.users.misskey.name;
};

4
modules/services/misskey.nix
View File

@ -29,8 +29,8 @@ inputs:
services.misskey =
{
description = "misskey";
after = [ "network.target" "redis-misskey.service" "postgresql.service" "meilisearch.service" ];
requires = [ "network.target" "redis-misskey.service" "postgresql.service" "meilisearch.service" ];
after = [ "network.target" "redis-misskey.service" "postgresql.service" "meilisearch-misskey.service" ];
requires = [ "network.target" "redis-misskey.service" "postgresql.service" "meilisearch-misskey.service" ];
wantedBy = [ "multi-user.target" ];
environment.MISSKEY_CONFIG_YML = inputs.config.sops.templates."misskey/default.yml".path;
serviceConfig = rec