diff --git a/.forgejo/workflows/deploy-rs.yml b/.forgejo/workflows/deploy-rs.yml index d2e43b8b..fcea2535 100644 --- a/.forgejo/workflows/deploy-rs.yml +++ b/.forgejo/workflows/deploy-rs.yml @@ -25,17 +25,19 @@ jobs: id cat /etc/resolv.conf - - name: "Setup: Tailscale Repo" - run: | - sudo mkdir -p --mode=0755 /usr/share/keyrings - curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/lunar.noarmor.gpg | sudo tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null - curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/lunar.tailscale-keyring.list | sudo tee /etc/apt/sources.list.d/tailscale.list - name: "Setup: Runner" run: | apt update -y apt install git nodejs nix-bin sudo tailscale -y git config --global user.email "${{github.actor}}" git config --global user.name "Albert J. Copeland" + + - name: "Setup: Tailscale Repo" + run: | + sudo mkdir -p --mode=0755 /usr/share/keyrings + curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/lunar.noarmor.gpg | sudo tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null + curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/lunar.tailscale-keyring.list | sudo tee /etc/apt/sources.list.d/tailscale.list + - name: "Setup: SSH" run: | rm -rf /root/.ssh @@ -48,7 +50,7 @@ jobs: echo "Public Key: " cat /root/.ssh/id_ed25519.pub - - name: "Setup: Headscale" + - name: "Setup: Headscale Network" run: | echo "tailscaled --cleanup" sudo tailscaled --cleanup diff --git a/nixos/hosts/backups-rpi4/scripts/rsync-data-vol.sh b/nixos/hosts/backups-rpi4/scripts/rsync-data-vol.sh index 728dc28f..3a05daa3 100644 --- a/nixos/hosts/backups-rpi4/scripts/rsync-data-vol.sh +++ b/nixos/hosts/backups-rpi4/scripts/rsync-data-vol.sh @@ -39,7 +39,7 @@ fi check=$(ssh root@nuc-docker01 df -h | grep 192.168.1.100 | wc -l) if [[ $check != 1 ]] ; then echo "Synology is not mounted on nuc-docker01: check returned $check" - payload="{\"message\": \"Backup stopped. Synology isn't mounted\nDate: `date`\", \"priority\": 2,\"title\": \"backups-rpi4: Backup Stopped\"}" + payload="{\"message\": \"Backup stopped. Synology isn't mounted\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-media.sh b/nixos/hosts/backups-rpi4/scripts/rsync-media.sh index 7cf977fa..99e758d2 100644 --- a/nixos/hosts/backups-rpi4/scripts/rsync-media.sh +++ b/nixos/hosts/backups-rpi4/scripts/rsync-media.sh @@ -39,7 +39,7 @@ fi check=$(ssh root@nuc-docker01 df -h | grep 192.168.1.100 | wc -l) if [[ $check != 1 ]] ; then echo "Synology is not mounted on nuc-docker01: check returned $check" - payload="{\"message\": \"Backup stopped. Synology isn't mounted\nDate: `date`\", \"priority\": 2,\"title\": \"backups-rpi4: Backup Stopped\"}" + payload="{\"message\": \"Backup stopped. Synology isn't mounted\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