From f07e61246583f2a115357ef082b6620a34e83d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 26 Oct 2023 23:26:01 +0200 Subject: Adjustments for monitoring and packages Refresh flakes --- flakes/etherpad-lite/flake.lock | 2 +- flakes/flake.lock | 80 ++++++++++++++-------------- flakes/grocy/flake.lock | 2 +- flakes/private/monitoring/objects_common.nix | 2 +- flakes/private/system/flake.lock | 2 +- flakes/private/system/flake.nix | 1 + flakes/surfer/flake.lock | 2 +- 7 files changed, 46 insertions(+), 45 deletions(-) (limited to 'flakes') diff --git a/flakes/etherpad-lite/flake.lock b/flakes/etherpad-lite/flake.lock index 19d9ffa..7859448 100644 --- a/flakes/etherpad-lite/flake.lock +++ b/flakes/etherpad-lite/flake.lock @@ -58,7 +58,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../mypackages", "type": "path" }, diff --git a/flakes/flake.lock b/flakes/flake.lock index e4b20b2..4af2301 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock @@ -2815,7 +2815,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-OFfV6XJcWqdRCBlRKMFmlGyBQPKmsjNfIQPLZn2R/e4=", + "narHash": "sha256-PicwNqwQaCKtN5zPpTfpSDRXbyn9xh8aHqoPnm9cFz8=", "path": "../../flakes/private/monitoring", "type": "path" }, @@ -2833,7 +2833,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-OFfV6XJcWqdRCBlRKMFmlGyBQPKmsjNfIQPLZn2R/e4=", + "narHash": "sha256-PicwNqwQaCKtN5zPpTfpSDRXbyn9xh8aHqoPnm9cFz8=", "path": "../../flakes/private/monitoring", "type": "path" }, @@ -2851,7 +2851,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-OFfV6XJcWqdRCBlRKMFmlGyBQPKmsjNfIQPLZn2R/e4=", + "narHash": "sha256-PicwNqwQaCKtN5zPpTfpSDRXbyn9xh8aHqoPnm9cFz8=", "path": "../../flakes/private/monitoring", "type": "path" }, @@ -2869,7 +2869,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-OFfV6XJcWqdRCBlRKMFmlGyBQPKmsjNfIQPLZn2R/e4=", + "narHash": "sha256-PicwNqwQaCKtN5zPpTfpSDRXbyn9xh8aHqoPnm9cFz8=", "path": "../../flakes/private/monitoring", "type": "path" }, @@ -3016,7 +3016,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../../mypackages", "type": "path" }, @@ -3033,7 +3033,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../mypackages", "type": "path" }, @@ -3050,7 +3050,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../mypackages", "type": "path" }, @@ -3067,7 +3067,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../../mypackages", "type": "path" }, @@ -3084,7 +3084,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../mypackages", "type": "path" }, @@ -3101,7 +3101,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../../mypackages", "type": "path" }, @@ -3118,7 +3118,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../../mypackages", "type": "path" }, @@ -3135,7 +3135,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../mypackages", "type": "path" }, @@ -3152,7 +3152,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../mypackages", "type": "path" }, @@ -3169,7 +3169,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../mypackages", "type": "path" }, @@ -3186,7 +3186,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../../mypackages", "type": "path" }, @@ -3203,7 +3203,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../../mypackages", "type": "path" }, @@ -3220,7 +3220,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../../mypackages", "type": "path" }, @@ -3753,7 +3753,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-dslxX2j+qIz/5OJ7J0cMzPhPxMUlM3EoPbHFz2/omjI=", + "narHash": "sha256-c1cwIQUXLFIFF2kbLKthwYqpxjRtCtMFMGgyJHT6Mx0=", "path": "../systems/backup-2", "type": "path" }, @@ -3776,7 +3776,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-AvUrsBvUQGIH39yTRvJKw/SGEca47QDGFjHYBwlmcMs=", + "narHash": "sha256-r9r1dLWgbjgm+MvU/c5htD9zlImUE3g8Vb+/9n/HVGk=", "path": "../systems/dilion", "type": "path" }, @@ -3824,7 +3824,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-yMHsjZMbUXAE/6Bhrm+UVPBi4SD3BMEk+t7k/7S9JVo=", + "narHash": "sha256-CugQxVXifzrt4VHpWStcnNt4idRBiRtDxpYCQ4qtUxo=", "path": "../systems/eldiron", "type": "path" }, @@ -3850,7 +3850,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kVtjdQDXiFQSWn5GlXIk2AzmNmF8pDbHX2VAF0LzYVE=", + "narHash": "sha256-xj+YK3GUD0sY+yxs1rPyObCN3yKpvCEMsZbOKIqSoW8=", "path": "../systems/monitoring-1", "type": "path" }, @@ -3875,7 +3875,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-cOshvc0O6G4I2h4K6oCWacgV9fMWnxHckGBE05Ob19E=", + "narHash": "sha256-So2ZdIfL3LKXRd4sTHBUDfnN16in6xfWS86Lxd6v/xI=", "path": "../systems/quatresaisons", "type": "path" }, @@ -3895,7 +3895,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-+3YfZ51C4Ip4mh5U5zJPzUR43rJWZezU3ccli/WpB1k=", + "narHash": "sha256-/H0YNxn7csP3GR/5e5DSv5FLAK8VBCySiyGXch+ykMg=", "path": "../systems/zoldene", "type": "path" }, @@ -7384,7 +7384,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-OFfV6XJcWqdRCBlRKMFmlGyBQPKmsjNfIQPLZn2R/e4=", + "narHash": "sha256-PicwNqwQaCKtN5zPpTfpSDRXbyn9xh8aHqoPnm9cFz8=", "path": "../../flakes/private/monitoring", "type": "path" }, @@ -7499,7 +7499,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-CCtWODUiUD8w0+GpDyFGCEgsKWukd26pUcwdACGZGTA=", + "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", "path": "../../flakes/private/system", "type": "path" }, @@ -7518,7 +7518,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-CCtWODUiUD8w0+GpDyFGCEgsKWukd26pUcwdACGZGTA=", + "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", "path": "../../flakes/private/system", "type": "path" }, @@ -7571,7 +7571,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-j6p9rVNwD0C3VN65VdnF3yG8fy5S8aAsi2kRXWPd3VE=", + "narHash": "sha256-QnTpL+hdTDC64EIjsidagJfJkmzWH9e9/WMCCRI3Plc=", "path": "../../flakes/etherpad-lite", "type": "path" }, @@ -7613,7 +7613,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-Xv5wFz3A1f+jkJ1hxb6DwisBwsZxaQccp/Kwe5lqwy0=", + "narHash": "sha256-hkiFggAWHN0O063fBakPNMNKgAPu9Kxtu6tMWakZtt8=", "path": "../../flakes/grocy", "type": "path" }, @@ -7694,7 +7694,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../../flakes/mypackages", "type": "path" }, @@ -7817,7 +7817,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-67TqavMsANZI6X15AFUQZ2zHSmoWJc80XaXwEGhWsRg=", + "narHash": "sha256-qVrX9q+syZ9CtWoJCiHQTmnt8O00jb7gmPGYwN+6UJg=", "path": "../../flakes/surfer", "type": "path" }, @@ -7962,7 +7962,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-j6p9rVNwD0C3VN65VdnF3yG8fy5S8aAsi2kRXWPd3VE=", + "narHash": "sha256-QnTpL+hdTDC64EIjsidagJfJkmzWH9e9/WMCCRI3Plc=", "path": "./etherpad-lite", "type": "path" }, @@ -8004,7 +8004,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-Xv5wFz3A1f+jkJ1hxb6DwisBwsZxaQccp/Kwe5lqwy0=", + "narHash": "sha256-hkiFggAWHN0O063fBakPNMNKgAPu9Kxtu6tMWakZtt8=", "path": "./grocy", "type": "path" }, @@ -8104,7 +8104,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "./mypackages", "type": "path" }, @@ -8294,7 +8294,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-OFfV6XJcWqdRCBlRKMFmlGyBQPKmsjNfIQPLZn2R/e4=", + "narHash": "sha256-PicwNqwQaCKtN5zPpTfpSDRXbyn9xh8aHqoPnm9cFz8=", "path": "./private/monitoring", "type": "path" }, @@ -8409,7 +8409,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-CCtWODUiUD8w0+GpDyFGCEgsKWukd26pUcwdACGZGTA=", + "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", "path": "./private/system", "type": "path" }, @@ -8451,7 +8451,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-67TqavMsANZI6X15AFUQZ2zHSmoWJc80XaXwEGhWsRg=", + "narHash": "sha256-qVrX9q+syZ9CtWoJCiHQTmnt8O00jb7gmPGYwN+6UJg=", "path": "./surfer", "type": "path" }, @@ -9015,7 +9015,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-CCtWODUiUD8w0+GpDyFGCEgsKWukd26pUcwdACGZGTA=", + "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", "path": "../../flakes/private/system", "type": "path" }, @@ -9034,7 +9034,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-CCtWODUiUD8w0+GpDyFGCEgsKWukd26pUcwdACGZGTA=", + "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", "path": "../../flakes/private/system", "type": "path" }, @@ -9053,7 +9053,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-CCtWODUiUD8w0+GpDyFGCEgsKWukd26pUcwdACGZGTA=", + "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", "path": "../../flakes/private/system", "type": "path" }, @@ -9072,7 +9072,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-CCtWODUiUD8w0+GpDyFGCEgsKWukd26pUcwdACGZGTA=", + "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", "path": "../../flakes/private/system", "type": "path" }, diff --git a/flakes/grocy/flake.lock b/flakes/grocy/flake.lock index 13aa4a6..2594651 100644 --- a/flakes/grocy/flake.lock +++ b/flakes/grocy/flake.lock @@ -58,7 +58,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../mypackages", "type": "path" }, diff --git a/flakes/private/monitoring/objects_common.nix b/flakes/private/monitoring/objects_common.nix index 1da7764..8eee639 100644 --- a/flakes/private/monitoring/objects_common.nix +++ b/flakes/private/monitoring/objects_common.nix @@ -187,7 +187,7 @@ check_interval = 120; notification_interval = "120"; max_check_attempts = "5"; - retry_interval = "5"; + retry_interval = "30"; }; }; # No contact, we go through master diff --git a/flakes/private/system/flake.lock b/flakes/private/system/flake.lock index 80584ef..04ae5fa 100644 --- a/flakes/private/system/flake.lock +++ b/flakes/private/system/flake.lock @@ -69,7 +69,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../../mypackages", "type": "path" }, diff --git a/flakes/private/system/flake.nix b/flakes/private/system/flake.nix index 4a83e36..c35955f 100644 --- a/flakes/private/system/flake.nix +++ b/flakes/private/system/flake.nix @@ -81,6 +81,7 @@ pkgs.rsync pkgs.strace pkgs.sqlite + pkgs.unzip pkgs.jq pkgs.yq diff --git a/flakes/surfer/flake.lock b/flakes/surfer/flake.lock index 66bea60..a1171d9 100644 --- a/flakes/surfer/flake.lock +++ b/flakes/surfer/flake.lock @@ -41,7 +41,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-C0plEL+g6kv5fo/VmTjMJK45RfFcGufqPKJVnviMyGY=", + "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", "path": "../mypackages", "type": "path" }, -- cgit v1.2.3