starred/nix-config
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-04-25 10:18:37 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

chore: update sftpgo & victoriametrics

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

7
hosts/idols-aquamarine/monitoring/module/default.nix
View File

@@ -13,8 +13,8 @@ with lib; let
"${cfg.package}/bin/victoria-metrics" "${cfg.package}/bin/victoria-metrics"
"-storageDataPath=/var/lib/${cfg.stateDir}" "-storageDataPath=/var/lib/${cfg.stateDir}"
"-httpListenAddr=${cfg.listenAddress}" "-httpListenAddr=${cfg.listenAddress}"
"-retentionPeriod=${cfg.retentionPeriod}"
] ]
++ lib.optionals (cfg.retentionPeriod != null) ["-retentionPeriod=${cfg.retentionPeriod}"]
++ cfg.extraOptions; ++ cfg.extraOptions;
prometheusConfigYml = checkedConfig ( prometheusConfigYml = checkedConfig (
settingsFormat.generate "prometheusConfig.yaml" cfg.prometheusConfig settingsFormat.generate "prometheusConfig.yaml" cfg.prometheusConfig
@@ -27,7 +27,7 @@ with lib; let
''; '';
in { in {
options.services.my-victoriametrics = { 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" {}; package = mkPackageOption pkgs "victoriametrics" {};
listenAddress = mkOption { listenAddress = mkOption {
@@ -127,11 +127,10 @@ in {
serviceConfig = { serviceConfig = {
ExecStart = lib.escapeShellArgs ( ExecStart = lib.escapeShellArgs (
startCLIList startCLIList
++ lib.optional (cfg.prometheusConfig != null) ["-promscrape.config=${prometheusConfigYml}"] ++ lib.optionals (cfg.prometheusConfig != null) ["-promscrape.config=${prometheusConfigYml}"]
); );
DynamicUser = true; DynamicUser = true;
User = "victoriametrics";
RestartSec = 1; RestartSec = 1;
Restart = "on-failure"; Restart = "on-failure";
RuntimeDirectory = "victoriametrics"; RuntimeDirectory = "victoriametrics";

2
hosts/idols-aquamarine/sftpgo.nix
View File

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

1
lib/colmenaSystem.nix
View File

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

1
lib/macosSystem.nix
View File

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

1
lib/nixosSystem.nix
View File

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