diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-16 18:51:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-16 18:51:05 +0000 |
| commit | f46cb8508278147e8c5adb041d345492c39cf9ae (patch) | |
| tree | 5ce026664e324c75d40950616b6a96171f36bf2f /nixos | |
| parent | 2445824f40799dd72f0120aa3f24b628c400cbf7 (diff) | |
| parent | afc9b7bb5f3d75deaab5dbca7d95d2187f6ef14a (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/azure-agent.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 6becc69627356..9638a7cb3e5ab 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -664,6 +664,8 @@ in # - There are only HDDs and we would set the system in a degraded state serviceConfig.ExecStart = ''${pkgs.runtimeShell} -c 'for pool in $(zpool list -H -o name); do zpool trim $pool; done || true' ''; }; + + systemd.timers.zpool-trim.timerConfig.Persistent = "yes"; }) ]; } diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index 81413792eda0a..41f3fa0e6642e 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -146,7 +146,7 @@ in services.logrotate = { enable = true; - config = '' + extraConfig = '' /var/log/waagent.log { compress monthly |