From fccc4dc5eaf4d5626a7a8915ffb00e3a3f4c8a96 Mon Sep 17 00:00:00 2001 From: albert Date: Tue, 14 May 2024 11:20:59 +0900 Subject: [PATCH] Manual updates --- README.md | 3 ++ flake.lock | 54 +++++++++---------- .../backups-rpi4/scripts/rsync-data-vol.sh | 5 ++ .../hosts/backups-rpi4/scripts/rsync-media.sh | 7 ++- .../backups-rpi4/scripts/rsync-sysctl.sh | 5 ++ 5 files changed, 46 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 438f837c..f69dc293 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,8 @@ nix develop -c /etc/nixos/git/docs/setup.sh * [ ] Maybe add a wallpaper randomizer button via `sww img` ## Homelab general +* [ ] High Priority: + * [ ] Replace AdguardHome with PiHole and GravitySync * [ ] Fixes: * [ ] Migrate Forgejo sqlite db to MySQL * [ ] Alternatively, figure out why sqlite is taking so long to load @@ -82,6 +84,7 @@ nix develop -c /etc/nixos/git/docs/setup.sh * [x] Jitsi * [ ] Mealie - v1.6.0 * [ ] Add OIDC config + * [ ] Re-install - Migration isn't working * [x] Lemmy * [x] Atuin * [x] Forgejo Runner diff --git a/flake.lock b/flake.lock index 47d743d5..7b7e8af2 100644 --- a/flake.lock +++ b/flake.lock @@ -240,11 +240,11 @@ ] }, "locked": { - "lastModified": 1715526530, - "narHash": "sha256-1ot3VxxbRexDAbk70n0yLt7EEEzypAGK3ut+YV7m/Mg=", + "lastModified": 1715563999, + "narHash": "sha256-DDXZOKK0C5YeZ/GTUj7HiT+oqYIt8+qTsldaDvhWHFc=", "owner": "nix-community", "repo": "disko", - "rev": "94a818d8b914e06c04c21b5f0bafbb4b96ee8b47", + "rev": "e972a78f4a49cd92075d64b6feeef64d26bf2996", "type": "github" }, "original": { @@ -864,11 +864,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1715526061, - "narHash": "sha256-zNH5+kWse9JBEvlBoyj8MLlbErAM+z+RoJEbWxK3fSg=", + "lastModified": 1715635266, + "narHash": "sha256-lqt84TgU7QpiLNNYT4cuTp4++X2rufr0gLzPMbGIZ78=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "fd35b35000fa11ce540d944966ff17c71c31fd27", + "rev": "ba696521930059aa489ac6ffabe28553edaf2fa3", "type": "github" }, "original": { @@ -941,11 +941,11 @@ ] }, "locked": { - "lastModified": 1715287423, - "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=", + "lastModified": 1715608589, + "narHash": "sha256-vimNaLjLcoNIvBhF37GaB6PRYEvKMamY3UnDE9M5MW8=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "e2fc1c0eb8b392110588f478cce644348ead7271", + "rev": "65c2636484e5cb00583b8a7446c3fb657f568883", "type": "github" }, "original": { @@ -1231,11 +1231,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715447595, - "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -1252,11 +1252,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1715516958, - "narHash": "sha256-ig9QNiwdjjDFoXhu8V8Nr37g2P4Z5szsT7GQG444cqA=", + "lastModified": 1715635058, + "narHash": "sha256-O3jukU8pY4cakJGGA1K9OorCxreVN4BuxhgA7KZOXv4=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "69d791b5586004223c53c07134302ff8d6d0991a", + "rev": "d008b47ddbce0676b30848d4e652cfbd6abce287", "type": "github" }, "original": { @@ -1267,11 +1267,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715087517, - "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -1299,11 +1299,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1715395895, - "narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=", + "lastModified": 1715542476, + "narHash": "sha256-FF593AtlzQqa8JpzrXyRws4CeKbc5W86o8tHt4nRfIg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71bae31b7dbc335528ca7e96f479ec93462323ff", + "rev": "44072e24566c5bcc0b7aa9178a0104f4cfffab19", "type": "github" }, "original": { @@ -1330,11 +1330,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1715447595, - "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -1418,11 +1418,11 @@ }, "nur": { "locked": { - "lastModified": 1715524382, - "narHash": "sha256-ftczmIyZgWSjiXT3Djbbo+QJMw2ZEYTxscOzW7zKRF0=", + "lastModified": 1715650963, + "narHash": "sha256-9uY11boBvXFEfZXKgb6yK+UmnsB40Fn4oOe4OzxqidY=", "owner": "nix-community", "repo": "NUR", - "rev": "ab1975853e951403f855043226dec29998b989f2", + "rev": "98e25989829207fdc2d4973a6496beea16d67632", "type": "github" }, "original": { diff --git a/nixos/hosts/backups-rpi4/scripts/rsync-data-vol.sh b/nixos/hosts/backups-rpi4/scripts/rsync-data-vol.sh index 6906cabd..a55b11a3 100644 --- a/nixos/hosts/backups-rpi4/scripts/rsync-data-vol.sh +++ b/nixos/hosts/backups-rpi4/scripts/rsync-data-vol.sh @@ -30,6 +30,11 @@ fi count=$(ps aux | grep $BACKUP_NAME | grep -v grep | wc -l) if [[ $count -ge 2 ]] ; then echo -e "$BACKUP_NAME rsync still running. Exiting...." + + echo "Output: " + ps aux | grep $BACKUP_NAME | grep -v grep + ps aux | grep $BACKUP_NAME | grep -v grep | wc -l + payload="{\"message\": \"$BACKUP_NAME stopped. $BACKUP_NAME is still running.\nDate: `date`\", \"priority\": 2,\"title\": \"japan-rpi4: $BACKUP_NAME Backup Stopped\"}" curl -X "POST" "https://gotify.sysctl.io/message" -H "accept: application/json" -H "Content-Type: application/json" -H "X-Gotify-Key: $GOTIFY_TOKEN" -d "$payload" exit diff --git a/nixos/hosts/backups-rpi4/scripts/rsync-media.sh b/nixos/hosts/backups-rpi4/scripts/rsync-media.sh index 01423cf3..fd67e775 100644 --- a/nixos/hosts/backups-rpi4/scripts/rsync-media.sh +++ b/nixos/hosts/backups-rpi4/scripts/rsync-media.sh @@ -30,7 +30,12 @@ fi count=$(ps aux | grep $BACKUP_NAME | grep -v grep | wc -l) if [[ $count -ge 2 ]] ; then echo -e "$BACKUP_NAME rsync still running. Exiting...." - payload="{\"message\": \"$BACKUP_NAME stopped. $BACKUP_NAME is still running.\nDate: `date`\", \"priority\": 2,\"title\": \"japan-rpi4: $BACKUP_NAME Backup Stopped\"}" + + echo "Output: " + ps aux | grep $BACKUP_NAME | grep -v grep + ps aux | grep $BACKUP_NAME | grep -v grep | wc -l + + payload="{\"message\": \"$BACKUP_NAME stopped. $BACKUP_NAME is still running.\n $count \n.\nDate: `date`\", \"priority\": 2,\"title\": \"japan-rpi4: $BACKUP_NAME Backup Stopped\"}" curl -X "POST" "https://gotify.sysctl.io/message" -H "accept: application/json" -H "Content-Type: application/json" -H "X-Gotify-Key: $GOTIFY_TOKEN" -d "$payload" exit fi diff --git a/nixos/hosts/backups-rpi4/scripts/rsync-sysctl.sh b/nixos/hosts/backups-rpi4/scripts/rsync-sysctl.sh index e4709377..b2a3e5f6 100644 --- a/nixos/hosts/backups-rpi4/scripts/rsync-sysctl.sh +++ b/nixos/hosts/backups-rpi4/scripts/rsync-sysctl.sh @@ -10,6 +10,11 @@ count=$(ps aux | grep $BACKUP_NAME | grep -v grep | wc -l) if [[ $count -ge 2 ]] ; then # There will always be at least 1: the current cronjob that's running echo -e "$BACKUP_NAME rsync still running. Exiting...." + + echo "Output: " + ps aux | grep $BACKUP_NAME | grep -v grep + ps aux | grep $BACKUP_NAME | grep -v grep | wc -l + payload="{\"message\": \"$BACKUP_NAME stopped. $BACKUP_NAME is still running.\nDate: `date`\", \"priority\": 2,\"title\": \"japan-rpi4: $BACKUP_NAME Backup Stopped\"}" curl -X "POST" "https://gotify.sysctl.io/message" -H "accept: application/json" -H "Content-Type: application/json" -H "X-Gotify-Key: $GOTIFY_TOKEN" -d "$payload" exit