From 0adb498f6df41807542d99e8b8d08533cd96156e Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 18 Aug 2024 18:11:06 -0300 Subject: git mv src/infrastructure/keys/ src/ --- Makefile | 10 +++++----- src/infrastructure/keys/SSH/andreh.pub.txt | 1 - .../keys/SSH/root@euandre.org.id_rsa.pub.stripped | 1 - src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.txt | 1 - src/keys/SSH/andreh.pub.txt | 1 + src/keys/SSH/root@euandre.org.id_rsa.pub.stripped | 1 + src/keys/SSH/root@euandre.org.id_rsa.pub.txt | 1 + 7 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 src/infrastructure/keys/SSH/andreh.pub.txt delete mode 100644 src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.stripped delete mode 100644 src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.txt create mode 100644 src/keys/SSH/andreh.pub.txt create mode 100644 src/keys/SSH/root@euandre.org.id_rsa.pub.stripped create mode 100644 src/keys/SSH/root@euandre.org.id_rsa.pub.txt diff --git a/Makefile b/Makefile index 24b6d9a..da2a634 100644 --- a/Makefile +++ b/Makefile @@ -6,16 +6,16 @@ DOCDIR = $(SHAREDIR)/doc/$(NAME) -all: public src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.stripped +all: public src/keys/SSH/root@euandre.org.id_rsa.pub.stripped packages system: ALWAYS \ - src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.stripped + src/keys/SSH/root@euandre.org.id_rsa.pub.stripped rm -f $@ guix build -r $@ -v3 -f src/guix/$@.scm -src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.stripped: \ - src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.txt +src/keys/SSH/root@euandre.org.id_rsa.pub.stripped: \ + src/keys/SSH/root@euandre.org.id_rsa.pub.txt cut -d' ' -f8- < $(@D)/`basename $(@F) .stripped`.txt > $@ install: all @@ -105,7 +105,7 @@ upload-secrets: $(prod-secrets.txt) ## Generate the ".ssh/authorized_keys" file and upload ## it to rsync.net. upload-keys: - cat src/infrastructure/keys/SSH/*.txt | ssh suyin dd of=.ssh/authorized_keys + cat src/keys/SSH/*.txt | ssh suyin dd of=.ssh/authorized_keys ALWAYS: diff --git a/src/infrastructure/keys/SSH/andreh.pub.txt b/src/infrastructure/keys/SSH/andreh.pub.txt deleted file mode 100644 index bfd5e6f..0000000 --- a/src/infrastructure/keys/SSH/andreh.pub.txt +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDnUv7iWOejQNa3fZ6v4lkHT6qFRp2+NuzIpFJ2Vy7eP58XZoiz6HJPcCU8Hf95JXwaXEwS4S7mXdw1x60hd8JIe058Ek6MZSSVQmlLfocGsAYj1wTrLmnQ8+PV0IeQlNj1aytBI1fL+v3IPt+JdLt6b+g3vwcEUU9efzxx2E0KZ5GIpb2meiCQ6ha+tcd7XqegB53eQj/h/coE2zLJodpaJ3xbj894pE/OJCNC0+4d0Sv7oHhY7QoLYldTQbSgPyhyfl4iZpJf6OEPZxK2cJaB+cbeoBB6aGNyU+CIJToM+uAJJ7H7EpvxfcnfJQ1PuY5szTdvFbW820euiUEKEW69mW4uaFNPSc6D4Z8tZ5hXQIqBD40irULhF0CYNkIILmyNV/KJIZ5HkbQ1q+UrCFHJyvuH/3aCTjj9OSfE7xHPQ3xd3Xw8vvj0Mjie09xFbbcklBTw5WRzH7cw8c+Q0O69kZZ8b+ykcdzWTeZeWNdnzptNqnMjfheig90rUIJ7DN0c+53jCUcGpWJxJhcYF9Uk1RNHmSE5+VzK1y+20t0grVFX90nApm4Tl35QPrX7Qxp9C81cWiUB8xCAE6jYrmd4x+P/3wSQfc1Xg0Eg3QjJB+6JD7cbyDJpzDR3ja+CLZCAr9I0B4rDKD2d6et/z67iXPnZUWMyZ8RVVZPFbBMOTw== openpgp:0xF727046D diff --git a/src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.stripped b/src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.stripped deleted file mode 100644 index 4a715ff..0000000 --- a/src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.stripped +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0o73ml7gMPhw/EwjIof6ph5PHPAL5EFDrP7PPZ9xCES79nSKZ0r40uW2RNp2Gzwb/QYtbr/aFkuX11Eo739upnj5cydyr4AHPLgoBoPVbn7/0/IIkin4r31GrWYdGzXRZSB5Tz0Za58OYW0RiUVHffx/E5+tOBQ2SMc6WK9/Q6FljGrD3yK/KYgZhcvmfsDTv2DGhFFORoUQSfGGwmRMJXGVPG2lDqoD3I3CWF34Y/b9GRHdSFgHy3iOas03WTsMaOSosmuF9MMm8Zn2515XGXU+uirsUJrFOa5leRBEvoEmx+WsB6CULn0PKk+ieghcq8z4j5oR1AOUFeSSJVIvlOyyt8x5rqLW8CvPFtU982LZrAq/DCcuaIkx/ww/cIbkUIN52Tv1Ia8jfV2aqRJ4hRshsuh9mj5fUlp+jmrMY6Ww5tl24OKrKRAT6pr5Fzgip927BkLPKJFClcp5fzZJLUiwNihYfuR5J+VselMPfxoTXfNVj/hsINclj2CLoCTM= root@toph diff --git a/src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.txt b/src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.txt deleted file mode 100644 index acedbf1..0000000 --- a/src/infrastructure/keys/SSH/root@euandre.org.id_rsa.pub.txt +++ /dev/null @@ -1 +0,0 @@ -command="borg1 serve --lock-wait 1200 --append-only --restrict-to-repository borg/euandre.org/",restrict ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0o73ml7gMPhw/EwjIof6ph5PHPAL5EFDrP7PPZ9xCES79nSKZ0r40uW2RNp2Gzwb/QYtbr/aFkuX11Eo739upnj5cydyr4AHPLgoBoPVbn7/0/IIkin4r31GrWYdGzXRZSB5Tz0Za58OYW0RiUVHffx/E5+tOBQ2SMc6WK9/Q6FljGrD3yK/KYgZhcvmfsDTv2DGhFFORoUQSfGGwmRMJXGVPG2lDqoD3I3CWF34Y/b9GRHdSFgHy3iOas03WTsMaOSosmuF9MMm8Zn2515XGXU+uirsUJrFOa5leRBEvoEmx+WsB6CULn0PKk+ieghcq8z4j5oR1AOUFeSSJVIvlOyyt8x5rqLW8CvPFtU982LZrAq/DCcuaIkx/ww/cIbkUIN52Tv1Ia8jfV2aqRJ4hRshsuh9mj5fUlp+jmrMY6Ww5tl24OKrKRAT6pr5Fzgip927BkLPKJFClcp5fzZJLUiwNihYfuR5J+VselMPfxoTXfNVj/hsINclj2CLoCTM= root@toph diff --git a/src/keys/SSH/andreh.pub.txt b/src/keys/SSH/andreh.pub.txt new file mode 100644 index 0000000..bfd5e6f --- /dev/null +++ b/src/keys/SSH/andreh.pub.txt @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDnUv7iWOejQNa3fZ6v4lkHT6qFRp2+NuzIpFJ2Vy7eP58XZoiz6HJPcCU8Hf95JXwaXEwS4S7mXdw1x60hd8JIe058Ek6MZSSVQmlLfocGsAYj1wTrLmnQ8+PV0IeQlNj1aytBI1fL+v3IPt+JdLt6b+g3vwcEUU9efzxx2E0KZ5GIpb2meiCQ6ha+tcd7XqegB53eQj/h/coE2zLJodpaJ3xbj894pE/OJCNC0+4d0Sv7oHhY7QoLYldTQbSgPyhyfl4iZpJf6OEPZxK2cJaB+cbeoBB6aGNyU+CIJToM+uAJJ7H7EpvxfcnfJQ1PuY5szTdvFbW820euiUEKEW69mW4uaFNPSc6D4Z8tZ5hXQIqBD40irULhF0CYNkIILmyNV/KJIZ5HkbQ1q+UrCFHJyvuH/3aCTjj9OSfE7xHPQ3xd3Xw8vvj0Mjie09xFbbcklBTw5WRzH7cw8c+Q0O69kZZ8b+ykcdzWTeZeWNdnzptNqnMjfheig90rUIJ7DN0c+53jCUcGpWJxJhcYF9Uk1RNHmSE5+VzK1y+20t0grVFX90nApm4Tl35QPrX7Qxp9C81cWiUB8xCAE6jYrmd4x+P/3wSQfc1Xg0Eg3QjJB+6JD7cbyDJpzDR3ja+CLZCAr9I0B4rDKD2d6et/z67iXPnZUWMyZ8RVVZPFbBMOTw== openpgp:0xF727046D diff --git a/src/keys/SSH/root@euandre.org.id_rsa.pub.stripped b/src/keys/SSH/root@euandre.org.id_rsa.pub.stripped new file mode 100644 index 0000000..4a715ff --- /dev/null +++ b/src/keys/SSH/root@euandre.org.id_rsa.pub.stripped @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0o73ml7gMPhw/EwjIof6ph5PHPAL5EFDrP7PPZ9xCES79nSKZ0r40uW2RNp2Gzwb/QYtbr/aFkuX11Eo739upnj5cydyr4AHPLgoBoPVbn7/0/IIkin4r31GrWYdGzXRZSB5Tz0Za58OYW0RiUVHffx/E5+tOBQ2SMc6WK9/Q6FljGrD3yK/KYgZhcvmfsDTv2DGhFFORoUQSfGGwmRMJXGVPG2lDqoD3I3CWF34Y/b9GRHdSFgHy3iOas03WTsMaOSosmuF9MMm8Zn2515XGXU+uirsUJrFOa5leRBEvoEmx+WsB6CULn0PKk+ieghcq8z4j5oR1AOUFeSSJVIvlOyyt8x5rqLW8CvPFtU982LZrAq/DCcuaIkx/ww/cIbkUIN52Tv1Ia8jfV2aqRJ4hRshsuh9mj5fUlp+jmrMY6Ww5tl24OKrKRAT6pr5Fzgip927BkLPKJFClcp5fzZJLUiwNihYfuR5J+VselMPfxoTXfNVj/hsINclj2CLoCTM= root@toph diff --git a/src/keys/SSH/root@euandre.org.id_rsa.pub.txt b/src/keys/SSH/root@euandre.org.id_rsa.pub.txt new file mode 100644 index 0000000..acedbf1 --- /dev/null +++ b/src/keys/SSH/root@euandre.org.id_rsa.pub.txt @@ -0,0 +1 @@ +command="borg1 serve --lock-wait 1200 --append-only --restrict-to-repository borg/euandre.org/",restrict ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0o73ml7gMPhw/EwjIof6ph5PHPAL5EFDrP7PPZ9xCES79nSKZ0r40uW2RNp2Gzwb/QYtbr/aFkuX11Eo739upnj5cydyr4AHPLgoBoPVbn7/0/IIkin4r31GrWYdGzXRZSB5Tz0Za58OYW0RiUVHffx/E5+tOBQ2SMc6WK9/Q6FljGrD3yK/KYgZhcvmfsDTv2DGhFFORoUQSfGGwmRMJXGVPG2lDqoD3I3CWF34Y/b9GRHdSFgHy3iOas03WTsMaOSosmuF9MMm8Zn2515XGXU+uirsUJrFOa5leRBEvoEmx+WsB6CULn0PKk+ieghcq8z4j5oR1AOUFeSSJVIvlOyyt8x5rqLW8CvPFtU982LZrAq/DCcuaIkx/ww/cIbkUIN52Tv1Ia8jfV2aqRJ4hRshsuh9mj5fUlp+jmrMY6Ww5tl24OKrKRAT6pr5Fzgip927BkLPKJFClcp5fzZJLUiwNihYfuR5J+VselMPfxoTXfNVj/hsINclj2CLoCTM= root@toph -- cgit v1.2.3