From 859cd2d8b7ccae3ac8c00beb3787675ab77a3470 Mon Sep 17 00:00:00 2001 From: counterweight Date: Mon, 15 Dec 2025 23:33:20 +0100 Subject: [PATCH] small memos stuff --- ansible/services/memos/memos_vars.yml | 11 +++++------ ansible/services/memos/setup_backup_memos_to_lapy.yml | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ansible/services/memos/memos_vars.yml b/ansible/services/memos/memos_vars.yml index dcd0aac..99618db 100644 --- a/ansible/services/memos/memos_vars.yml +++ b/ansible/services/memos/memos_vars.yml @@ -14,12 +14,11 @@ memos_tailscale_ip: "100.64.0.4" # (caddy_sites_dir and subdomain in services_config.yml) -# Remote access (for backup from lapy) -backup_host_name: "memos_box_local" -backup_host: "{{ hostvars.get(backup_host_name, {}).get('ansible_host', backup_host_name) }}" -backup_user: "{{ hostvars.get(backup_host_name, {}).get('ansible_user', 'counterweight') }}" -backup_key_file: "{{ hostvars.get(backup_host_name, {}).get('ansible_ssh_private_key_file', '') }}" -backup_port: "{{ hostvars.get(backup_host_name, {}).get('ansible_port', 22) }}" +# Remote access (for backup from lapy via Tailscale) +backup_host: "{{ memos_tailscale_hostname }}" +backup_user: "counterweight" +backup_key_file: "~/.ssh/counterganzua" +backup_port: 22 # Local backup local_backup_dir: "{{ lookup('env', 'HOME') }}/memos-backups" diff --git a/ansible/services/memos/setup_backup_memos_to_lapy.yml b/ansible/services/memos/setup_backup_memos_to_lapy.yml index 3e3718e..6d9c161 100644 --- a/ansible/services/memos/setup_backup_memos_to_lapy.yml +++ b/ansible/services/memos/setup_backup_memos_to_lapy.yml @@ -46,7 +46,7 @@ SSH_CMD="ssh -p {{ backup_port }}" {% endif %} - rsync -az -e "$SSH_CMD" --delete {{ backup_user }}@{{ backup_host }}:{{ backup_data_path }}/ "$BACKUP_DIR/" + rsync -az -e "$SSH_CMD" --rsync-path="sudo rsync" --delete {{ backup_user }}@{{ backup_host }}:{{ backup_data_path }}/ "$BACKUP_DIR/" # Rotate old backups (keep 14 days) # Calculate cutoff date (14 days ago) and delete backups older than that