rrvsh/pantheon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(nixos): use new persistDirs option and remove environment.persistence where possible

Browse source
This commit is contained in:
Mohammad Rafiq 2025-06-14 19:59:42 +08:00
parent 16b7f375bd
commit 77d8ed7a13
No known key found for this signature in database
9 changed files with 98 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

37
modules/nixos/server/databases/default.nix
View file

@ -5,6 +5,7 @@
...
}:
let
inherit (lib) singleton;
cfg = config.server.databases;
in
{
@ -26,13 +27,11 @@ in
config = lib.mkMerge [
(lib.mkIf cfg.postgresql.enable {
networking.firewall.allowedTCPPorts = lib.singleton cfg.postgresql.port;
environment.persistence."/persist".directories = [
{
directory = builtins.toString config.services.postgresql.dataDir;
user = "postgres";
group = "postgres";
}
];
persistDirs = singleton {
directory = builtins.toString config.services.postgresql.dataDir;
user = "postgres";
group = "postgres";
};
services.postgresql = {
enable = true;
enableTCPIP = true;
@ -48,13 +47,11 @@ in
})
(lib.mkIf cfg.mongodb.enable {
networking.firewall.allowedTCPPorts = [ cfg.mongodb.port ];
environment.persistence."/persist".directories = [
{
directory = builtins.toString config.services.mongodb.dbpath;
user = "mongodb";
group = "mongodb";
}
];
persistDirs = singleton {
directory = builtins.toString config.services.mongodb.dbpath;
user = "mongodb";
group = "mongodb";
};
services.mongodb = {
enable = true;
bind_ip = "0.0.0.0";
@ -65,13 +62,11 @@ in
})
(lib.mkIf cfg.mysql.enable {
networking.firewall.allowedTCPPorts = [ cfg.mysql.port ];
environment.persistence."/persist".directories = [
{
directory = builtins.toString config.services.mysql.dataDir;
user = "mysql";
group = "mysql";
}
];
persistDirs = singleton {
directory = builtins.toString config.services.mysql.dataDir;
user = "mysql";
group = "mysql";
};
services.mysql = {
enable = true;
package = pkgs.mariadb;

2
modules/nixos/server/web-apps/librechat/default.nix
View file

@ -23,7 +23,7 @@ in
};
config = mkIf cfg.enable {
environment.persistence."/persist".directories = singleton {
persistDirs = singleton {
directory = upstreamCfg.logDir;
inherit (upstreamCfg) user group;
};

2
modules/nixos/server/web-apps/mattermost/default.nix
View file

@ -33,7 +33,7 @@ in
message = "You must enable a local instance of postgresql.";
}
];
environment.persistence."/persist".directories = [
persistDirs = [
(mkDir cfg.configDir)
(mkDir cfg.logDir)
(mkDir cfg.dataDir)

27
modules/nixos/server/web-apps/sd-webui-forge/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ config, lib, ... }:
let
inherit (lib) singleton mkEnableOption mkIf;
cfg = config.server.sd-webui-forge;
upstreamCfg = config.services.sd-webui-forge;
in
{
options.server.sd-webui-forge = {
enable = mkEnableOption "";
};
config = mkIf cfg.enable {
assertions = singleton {
assertion = config.hardware.gpu == "nvidia";
message = "You must run the sd-webui-forge service only with an nvidia gpu.";
};
persistDirs = singleton {
directory = upstreamCfg.dataDir;
inherit (upstreamCfg) user group;
};
services.sd-webui-forge = {
enable = true;
listen = true;
extraArgs = "--cuda-malloc";
};
};
}