Manual updates

This commit is contained in:
albert 2024-05-14 11:20:59 +09:00
parent 9d5d6f4143
commit fccc4dc5ea
Signed by: albert
GPG key ID: 3895DD267CA11BA9
5 changed files with 46 additions and 28 deletions

View file

@ -64,6 +64,8 @@ nix develop -c /etc/nixos/git/docs/setup.sh
* [ ] Maybe add a wallpaper randomizer button via `sww img` * [ ] Maybe add a wallpaper randomizer button via `sww img`
## Homelab general ## Homelab general
* [ ] High Priority:
* [ ] Replace AdguardHome with PiHole and GravitySync
* [ ] Fixes: * [ ] Fixes:
* [ ] Migrate Forgejo sqlite db to MySQL * [ ] Migrate Forgejo sqlite db to MySQL
* [ ] Alternatively, figure out why sqlite is taking so long to load * [ ] 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 * [x] Jitsi
* [ ] Mealie - v1.6.0 * [ ] Mealie - v1.6.0
* [ ] Add OIDC config * [ ] Add OIDC config
* [ ] Re-install - Migration isn't working
* [x] Lemmy * [x] Lemmy
* [x] Atuin * [x] Atuin
* [x] Forgejo Runner * [x] Forgejo Runner

View file

@ -240,11 +240,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715526530, "lastModified": 1715563999,
"narHash": "sha256-1ot3VxxbRexDAbk70n0yLt7EEEzypAGK3ut+YV7m/Mg=", "narHash": "sha256-DDXZOKK0C5YeZ/GTUj7HiT+oqYIt8+qTsldaDvhWHFc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "94a818d8b914e06c04c21b5f0bafbb4b96ee8b47", "rev": "e972a78f4a49cd92075d64b6feeef64d26bf2996",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -864,11 +864,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1715526061, "lastModified": 1715635266,
"narHash": "sha256-zNH5+kWse9JBEvlBoyj8MLlbErAM+z+RoJEbWxK3fSg=", "narHash": "sha256-lqt84TgU7QpiLNNYT4cuTp4++X2rufr0gLzPMbGIZ78=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "fd35b35000fa11ce540d944966ff17c71c31fd27", "rev": "ba696521930059aa489ac6ffabe28553edaf2fa3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -941,11 +941,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715287423, "lastModified": 1715608589,
"narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=", "narHash": "sha256-vimNaLjLcoNIvBhF37GaB6PRYEvKMamY3UnDE9M5MW8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "e2fc1c0eb8b392110588f478cce644348ead7271", "rev": "65c2636484e5cb00583b8a7446c3fb657f568883",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1231,11 +1231,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1715447595, "lastModified": 1715534503,
"narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1252,11 +1252,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1715516958, "lastModified": 1715635058,
"narHash": "sha256-ig9QNiwdjjDFoXhu8V8Nr37g2P4Z5szsT7GQG444cqA=", "narHash": "sha256-O3jukU8pY4cakJGGA1K9OorCxreVN4BuxhgA7KZOXv4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "69d791b5586004223c53c07134302ff8d6d0991a", "rev": "d008b47ddbce0676b30848d4e652cfbd6abce287",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1267,11 +1267,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1715087517, "lastModified": 1715534503,
"narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1299,11 +1299,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1715395895, "lastModified": 1715542476,
"narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=", "narHash": "sha256-FF593AtlzQqa8JpzrXyRws4CeKbc5W86o8tHt4nRfIg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "71bae31b7dbc335528ca7e96f479ec93462323ff", "rev": "44072e24566c5bcc0b7aa9178a0104f4cfffab19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1330,11 +1330,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1715447595, "lastModified": 1715534503,
"narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1418,11 +1418,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1715524382, "lastModified": 1715650963,
"narHash": "sha256-ftczmIyZgWSjiXT3Djbbo+QJMw2ZEYTxscOzW7zKRF0=", "narHash": "sha256-9uY11boBvXFEfZXKgb6yK+UmnsB40Fn4oOe4OzxqidY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "ab1975853e951403f855043226dec29998b989f2", "rev": "98e25989829207fdc2d4973a6496beea16d67632",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -30,6 +30,11 @@ fi
count=$(ps aux | grep $BACKUP_NAME | grep -v grep | wc -l) count=$(ps aux | grep $BACKUP_NAME | grep -v grep | wc -l)
if [[ $count -ge 2 ]] ; then if [[ $count -ge 2 ]] ; then
echo -e "$BACKUP_NAME rsync still running. Exiting...." 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\"}" 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" 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 exit

View file

@ -30,7 +30,12 @@ fi
count=$(ps aux | grep $BACKUP_NAME | grep -v grep | wc -l) count=$(ps aux | grep $BACKUP_NAME | grep -v grep | wc -l)
if [[ $count -ge 2 ]] ; then if [[ $count -ge 2 ]] ; then
echo -e "$BACKUP_NAME rsync still running. Exiting...." 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" 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 exit
fi fi

View file

@ -10,6 +10,11 @@ count=$(ps aux | grep $BACKUP_NAME | grep -v grep | wc -l)
if [[ $count -ge 2 ]] ; then if [[ $count -ge 2 ]] ; then
# There will always be at least 1: the current cronjob that's running # There will always be at least 1: the current cronjob that's running
echo -e "$BACKUP_NAME rsync still running. Exiting...." 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\"}" 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" 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 exit