diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | src/infrastructure/keys/SSH/andreh.pub.txt (renamed from src/infrastructure/keys/SSH/andreh.pub) | 0 | ||||
| -rw-r--r-- | src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.txt (renamed from src/infrastructure/keys/SSH/root@toph.pub) | 0 | ||||
| -rw-r--r-- | src/secrets/root@euandre.org.id_rsa.txt.gpg (renamed from src/secrets/root.id_rsa.txt.gpg) | 0 |
4 files changed, 6 insertions, 5 deletions
@@ -15,12 +15,12 @@ public: prod-secrets.txt.gpg = \ - src/secrets/borg-passphrase.txt.gpg + src/secrets/borg-passphrase.txt.gpg \ + src/secrets/root@euandre.org.id_rsa.txt.gpg prod-secrets.txt = $(prod-secrets.txt.gpg:.gpg=) repo-secrets = \ $(prod-secrets.txt.gpg) \ - src/secrets/root.id_rsa.txt.gpg \ @@ -34,16 +34,17 @@ $(repo-secrets): gpg -aer eu@euandre.org < $(@D)/`basename $@ .gpg` > $@ -upload-secrets: $(prod-secrets.txt) +public-ssh = src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.txt +upload-secrets: $(prod-secrets.txt) $(public-ssh) ssh euandre.org sudo -u secrets-keeper 'rm -f /opt/secrets/*' rsync \ --rsync-path='sudo -u secrets-keeper rsync' \ --chmod=000 \ -avzP \ - $(prod-secrets.txt) euandre.org:/opt/secrets/ + $(prod-secrets.txt) $(public-ssh) euandre.org:/opt/secrets/ ## Generate the ".ssh/authorized_keys" file and upload ## it to rsync.net. upload-keys: - cat src/infrastructure/keys/SSH/*.pub | ssh suyin dd of=.ssh/authorized_keys + cat src/infrastructure/keys/SSH/*.txt | ssh suyin dd of=.ssh/authorized_keys diff --git a/src/infrastructure/keys/SSH/andreh.pub b/src/infrastructure/keys/SSH/andreh.pub.txt index bfd5e6f..bfd5e6f 100644 --- a/src/infrastructure/keys/SSH/andreh.pub +++ b/src/infrastructure/keys/SSH/andreh.pub.txt diff --git a/src/infrastructure/keys/SSH/root@toph.pub b/src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.txt index 2a4b735..2a4b735 100644 --- a/src/infrastructure/keys/SSH/root@toph.pub +++ b/src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.txt diff --git a/src/secrets/root.id_rsa.txt.gpg b/src/secrets/root@euandre.org.id_rsa.txt.gpg index f46f9ae..f46f9ae 100644 --- a/src/secrets/root.id_rsa.txt.gpg +++ b/src/secrets/root@euandre.org.id_rsa.txt.gpg |