tlaternet/tlaternet-server
1
0
Fork 0
Code Issues 10 Pull requests Activity

Update #151

Manually merged
tlater merged 2 commits from tlater/update into master 2025-08-02 11:35:01 +01:00
Conversation 0 Commits 2 Files changed 5 +138 -141
5 changed files with 138 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configuration/nginx.nix
View file

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

6
configuration/services/backups.nix
View file

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

5
configuration/services/crowdsec.nix
View file

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

3
configuration/services/metrics/options.nix
View file

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

24
flake.lock generated
View file

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