diff options
| author | EuAndreh <eu@euandre.org> | 2019-06-05 19:09:10 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2019-06-05 19:10:57 -0300 |
| commit | d79c397db73546214e2dd2717d1f2f139f10a182 (patch) | |
| tree | 36ce8c11279f0655ea2494bb136c59cdf5c0fc47 | |
| parent | Change permission of borg client key (diff) | |
| download | server-d79c397db73546214e2dd2717d1f2f139f10a182.tar.gz server-d79c397db73546214e2dd2717d1f2f139f10a182.tar.xz | |
Use specific known keys for connecting with the backup server
| -rwxr-xr-x | scripts/box/run-backup.env.sh | 2 | ||||
| -rwxr-xr-x | scripts/ci/provision.sh | 5 | ||||
| -rw-r--r-- | secrets/borg/borg-remote (renamed from secrets/borg/borg_remote) | 0 | ||||
| -rw-r--r-- | secrets/borg/borg-remote.pub (renamed from secrets/borg/borg_remote.pub) | 0 | ||||
| -rw-r--r-- | secrets/borg/known-hosts.txt | 2 |
5 files changed, 6 insertions, 3 deletions
diff --git a/scripts/box/run-backup.env.sh b/scripts/box/run-backup.env.sh index e1ecdf0..bd506e9 100755 --- a/scripts/box/run-backup.env.sh +++ b/scripts/box/run-backup.env.sh @@ -2,7 +2,7 @@ export BORG_REMOTE_PATH="${BORG_REMOTE_PATH}" export BORG_PASSPHRASE="${BORG_PASSPHRASE}" -# The configured $BORG_REPO is already the rsync.net remote. +# The configured $BORG_REPO is already the rsync remote. # No need to send the files after the backup is done. borg create \ --verbose \ diff --git a/scripts/ci/provision.sh b/scripts/ci/provision.sh index d4121b1..1000a55 100755 --- a/scripts/ci/provision.sh +++ b/scripts/ci/provision.sh @@ -10,8 +10,9 @@ export VPS_COMMIT_SHA echo "Shutting down running containers and backing up data..." ssh "$TLD" "cd /home/vps/ && docker-compose down" -scp ./secrets/borg/borg_remote.pub "$TLD":/root/.ssh/id_rsa.pub -scp ./secrets/borg/borg_remote "$TLD":/root/.ssh/id_rsa +scp ./secrets/borg/borg-remote.pub "$TLD":/root/.ssh/id_rsa.pub +scp ./secrets/borg/borg-remote "$TLD":/root/.ssh/id_rsa +scp ./secrets/borg/known-hosts.txt "$TLD":/root/.ssh/known_hosts ssh "$TLD" 'chmod 600 /root/.ssh/id_rsa' envsubst < ./scripts/box/run-backup.env.sh | ssh "$TLD" 'cat > /home/vps/run-backup.sh && chmod +x /home/vps/run-backup.sh' ssh "$TLD" /home/vps/run-backup.sh diff --git a/secrets/borg/borg_remote b/secrets/borg/borg-remote index ba43489..ba43489 100644 --- a/secrets/borg/borg_remote +++ b/secrets/borg/borg-remote diff --git a/secrets/borg/borg_remote.pub b/secrets/borg/borg-remote.pub index 2f7af58..2f7af58 100644 --- a/secrets/borg/borg_remote.pub +++ b/secrets/borg/borg-remote.pub diff --git a/secrets/borg/known-hosts.txt b/secrets/borg/known-hosts.txt new file mode 100644 index 0000000..92e0bff --- /dev/null +++ b/secrets/borg/known-hosts.txt @@ -0,0 +1,2 @@ +|1|cIJON6PduW/wshQJDXxwHhyhFAw=|qrVaCqD6EhUWC9cy4V4/d1HWawM= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKBxDZv64oRMzRkywjmRRrml2pr0XFSZhlL46nUSmM60 +|1|2EjhxKgzkKA8b4cs68lhegyfMUY=|og+e2P84/wUNwuelEPIvy5M2zvQ= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKBxDZv64oRMzRkywjmRRrml2pr0XFSZhlL46nUSmM60 |