Update #151

Manually merged
tlater merged 2 commits from tlater/update into master 2025-08-02 11:35:01 +01:00
5 changed files with 138 additions and 141 deletions

View file

@ -20,8 +20,7 @@
'';
};
logrotate.settings =
{
logrotate.settings = {
# Override the default, just keep fewer logs
nginx.rotate = 6;
}

View file

@ -140,8 +140,7 @@ in
};
config = lib.mkIf (config.services.backups != { }) {
systemd.services =
{
systemd.services = {
restic-prune = {
# Doesn't hurt to finish the ongoing prune
restartIfChanged = false;
@ -235,8 +234,7 @@ in
}
) config.services.backups;
systemd.timers =
{
systemd.timers = {
restic-prune = {
wantedBy = [ "timers.target" ];
timerConfig.OnCalendar = "Thursday 03:00:00 UTC";

View file

@ -30,8 +30,9 @@
{
labels.type = "nginx";
filenames =
[ "/var/log/nginx/*.log" ]
filenames = [
"/var/log/nginx/*.log"
]
++ lib.mapAttrsToList (
vHost: _: "/var/log/nginx/${vHost}/access.log"
) config.services.nginx.virtualHosts;

View file

@ -154,8 +154,7 @@ in
lib.recursiveUpdate {
inherit (scrape) job_name;
static_configs =
scrape.static_configs
++ lib.optional (scrape.targets != [ ]) { inherit (scrape) targets; };
scrape.static_configs ++ lib.optional (scrape.targets != [ ]) { inherit (scrape) targets; };
} scrape.extraSettings
) config.services.victoriametrics.scrapeConfigs;
};

24
flake.lock generated
View file

@ -300,11 +300,11 @@
]
},
"locked": {
"lastModified": 1750903843,
"narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=",
"lastModified": 1753140376,
"narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
"owner": "nix-community",
"repo": "disko",
"rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae",
"rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
"type": "github"
},
"original": {
@ -595,11 +595,11 @@
]
},
"locked": {
"lastModified": 1748450994,
"narHash": "sha256-BWdJ+3lPmK99kjWfBlppKSRIH0sBlT1fpUkSvlgmvoA=",
"lastModified": 1752975459,
"narHash": "sha256-nOr9FfazId66oneIeeH6e5eALWcu0/zPn19DqbeFGME=",
"owner": "reckenrode",
"repo": "nix-foundryvtt",
"rev": "d5fe29ab69176aa0c7727fa7c57889a2aa577355",
"rev": "924f814523ea8c8792178ec5171ea055abaae0e4",
"type": "github"
},
"original": {
@ -746,11 +746,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1751230698,
"narHash": "sha256-ANWE9dHPeACz3SIbUhbWZforTgfAvOS5Tg1l4yYa/B0=",
"lastModified": 1754108423,
"narHash": "sha256-0AhuEljFdqvY4894RArZH+mzd1Y0Wojmfq8znh0ireg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e410afb41ba16a2ceeaeff85c536d35f10bbbdcf",
"rev": "a41340f34fa59485a7c2017af3506b2ee1b216d8",
"type": "github"
},
"original": {
@ -1079,11 +1079,11 @@
]
},
"locked": {
"lastModified": 1750119275,
"narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
"lastModified": 1752544651,
"narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
"rev": "2c8def626f54708a9c38a5861866660395bb3461",
"type": "github"
},
"original": {