chore: update sftpgo & victoriametrics

fix: home-manager
This commit is contained in:
Ryan Yin
2024-10-31 23:48:17 +08:00
parent e4c256145b
commit 30947c3ded
5 changed files with 7 additions and 5 deletions

View File

@@ -13,8 +13,8 @@ with lib; let
"${cfg.package}/bin/victoria-metrics"
"-storageDataPath=/var/lib/${cfg.stateDir}"
"-httpListenAddr=${cfg.listenAddress}"
"-retentionPeriod=${cfg.retentionPeriod}"
]
++ lib.optionals (cfg.retentionPeriod != null) ["-retentionPeriod=${cfg.retentionPeriod}"]
++ cfg.extraOptions;
prometheusConfigYml = checkedConfig (
settingsFormat.generate "prometheusConfig.yaml" cfg.prometheusConfig
@@ -27,7 +27,7 @@ with lib; let
'';
in {
options.services.my-victoriametrics = {
enable = mkEnableOption "VictoriaMetrics, a time series database.";
enable = mkEnableOption "VictoriaMetrics is a fast, cost-effective and scalable monitoring solution and time series database.";
package = mkPackageOption pkgs "victoriametrics" {};
listenAddress = mkOption {
@@ -127,11 +127,10 @@ in {
serviceConfig = {
ExecStart = lib.escapeShellArgs (
startCLIList
++ lib.optional (cfg.prometheusConfig != null) ["-promscrape.config=${prometheusConfigYml}"]
++ lib.optionals (cfg.prometheusConfig != null) ["-promscrape.config=${prometheusConfigYml}"]
);
DynamicUser = true;
User = "victoriametrics";
RestartSec = 1;
Restart = "on-failure";
RuntimeDirectory = "victoriametrics";

View File

@@ -8,7 +8,7 @@ in {
# Create Directories
# https://www.freedesktop.org/software/systemd/man/latest/tmpfiles.d.html#Type
systemd.tmpfiles.rules = [
"d ${dataDir} 0755 ${user} ${user}"
"D ${dataDir} 0755 ${user} ${user}"
];
services.sftpgo = {

View File

@@ -30,6 +30,7 @@ in
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.backupFileExtension = "home-manager.backup";
home-manager.extraSpecialArgs = specialArgs;
home-manager.users."${myvars.username}".imports = home-modules;

View File

@@ -27,6 +27,7 @@ in
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.backupFileExtension = "home-manager.backup";
home-manager.extraSpecialArgs = specialArgs;
home-manager.users."${myvars.username}".imports = home-modules;

View File

@@ -25,6 +25,7 @@ in
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.backupFileExtension = "home-manager.backup";
home-manager.extraSpecialArgs = specialArgs;
home-manager.users."${myvars.username}".imports = home-modules;