From 77118176e8151b419a920498c405c1a068430a7c Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 27 Mar 2024 22:46:34 +0900 Subject: [PATCH] Updates --- nixos/hosts/backups-rpi4/backup-script.nix | 11 +++++------ nixos/hosts/osaka-linode-01/wireguard.nix | 15 ++++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/hosts/backups-rpi4/backup-script.nix b/nixos/hosts/backups-rpi4/backup-script.nix index c0c8135a..61b92d21 100644 --- a/nixos/hosts/backups-rpi4/backup-script.nix +++ b/nixos/hosts/backups-rpi4/backup-script.nix @@ -1,6 +1,5 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: let - ifExists = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups; rsync-backups = pkgs.writeScriptBin "rsync-backups" '' #!${pkgs.stdenv.shell} # Send the gotify notification: @@ -185,8 +184,8 @@ fi echo -e "================================================================================" echo -e "======= Time: `date`" -echo -e "rsync -avr --delete --exclude=Downloads/ --exclude=Data/Docker/sysctl\.io/ root@nuc-docker01:/Storage/Data/ /mnt/$drive1/Data/" -rsync -avr --delete --exclude=Downloads/ --exclude=Data/Docker/sysctl\.io/ root@nuc-docker01:/Storage/Data/ /mnt/$drive1/Data/ +echo -e "rsync -avr --delete --exclude=Downloads/ --exclude='Data/Docker/sysctl.io/' root@nuc-docker01:/Storage/Data/ /mnt/$drive1/Data/" +rsync -avr --delete --exclude=Downloads/ --exclude='Data/Docker/sysctl.io/' root@nuc-docker01:/Storage/Data/ /mnt/$drive1/Data/ echo -e "======= Time: `date`" echo -e "======= Time complete: `date`" @@ -243,8 +242,8 @@ fi echo -e "================================================================================" echo -e "======= Time: `date`" -echo -e "rsync -avr --delete --exclude=Downloads/ root@framework-server:/Storage/Data/Docker/sysctl.io/ /mnt/$drive1/Data/Docker/sysctl.io/" -rsync -avr --delete --exclude=Downloads/ root@framework-server:/Storage/Data/Docker/sysctl.io/ /mnt/$drive1/Data/Docker/sysctl.io/ +echo -e "rsync -avr --delete root@framework-server:/Storage/Data/Docker/sysctl.io/ /mnt/$drive1/Data/Docker/sysctl.io/" +rsync -avr --delete root@framework-server:/Storage/Data/Docker/sysctl.io/ /mnt/$drive1/Data/Docker/sysctl.io/ echo -e "======= Time: `date`" echo -e "======= Time complete: `date`" diff --git a/nixos/hosts/osaka-linode-01/wireguard.nix b/nixos/hosts/osaka-linode-01/wireguard.nix index 8dc7e3a8..c17d1964 100644 --- a/nixos/hosts/osaka-linode-01/wireguard.nix +++ b/nixos/hosts/osaka-linode-01/wireguard.nix @@ -1,17 +1,18 @@ -{ pkgs, config, lib, ... }: { +{ pkgs, ... }: { # Allow these hosts to directly communicate with their hostnames networking.extraHosts = '' 10.100.0.1 osaka-linode-01 - 10.100.0.2 framework-server 10.100.0.3 backups-rpi4 - - 10.100.0.2 git.sysctl.io - 10.100.0.2 loki.sysctl.io - 10.100.0.2 telegraf.sysctl.io - 10.100.0.2 headscale.sysctl.io ''; +# 10.100.0.2 framework-server +# 10.100.0.2 git.sysctl.io +# 10.100.0.2 loki.sysctl.io +# 10.100.0.2 telegraf.sysctl.io +# 10.100.0.2 headscale.sysctl.io +# ''; + networking.firewall.allowedUDPPorts = [ 51820 ]; networking.firewall.interfaces.wireguard0.allowedTCPPorts = [ 22 ];