From 42a6110e3c202a235db2caa1ab3d87a8ecb1690d Mon Sep 17 00:00:00 2001
From: kjuulh <contact@kjuulh.io>
Date: Fri, 18 Feb 2022 16:26:35 +0100
Subject: [PATCH] Add zip keys

---
 .drone.yml                       |   7 +++++--
 infrastructure/.gitignore        |   1 +
 infrastructure/ssh_keys.zip      | Bin 0 -> 936 bytes
 infrastructure/unzip-ssh-keys.sh |   7 +++++++
 infrastructure/zip-ssh-keys.sh   |  12 ++++++++++++
 5 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 infrastructure/.gitignore
 create mode 100644 infrastructure/ssh_keys.zip
 create mode 100755 infrastructure/unzip-ssh-keys.sh
 create mode 100755 infrastructure/zip-ssh-keys.sh

diff --git a/.drone.yml b/.drone.yml
index 8c38b13..82e4fc8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,8 +11,11 @@ steps:
         from_secret: serverctl_access_key
       SECRET_KEY:
         from_secret: serverctl_secret_key
+      SSH_ZIP_KEY:
+        from_secret: serverctl_ssh_zip_key
     commands:
-      - apk --update add curl
+      - apk --update add curl zip
+      - cd infrastructure && unzip-ssh-keys "$SSH_ZIP_KEY" && cd ..
       - curl --silent --output terraform.zip "https://releases.hashicorp.com/terraform/1.1.6/terraform_1.1.6_linux_amd64.zip"
       - unzip terraform.zip ; rm -f terraform.zip; chmod +x terraform
       - mkdir -p ${HOME}/bin ; export PATH=${PATH}:${HOME}/bin; mv terraform ${HOME}/bin/
@@ -20,4 +23,4 @@ steps:
       - cd infrastructure/create-resources
       - terraform init -backend-config="access_key=$ACCESS_KEY" -backend-config="secret_key=$SECRET_KEY"
       - terraform validate
-      - terraform apply -auto-approve -var "hcloud_token=$HCLOUD_TOKEN"
+      - terraform apply -auto-approve -var "hcloud_token=$HCLOUD_TOKEN" -var "pvt_key='../ssh_keys/id_ed25519'" -var "pub_key='../ssh_keys/id_ed25519.pub'"
diff --git a/infrastructure/.gitignore b/infrastructure/.gitignore
new file mode 100644
index 0000000..ac5629f
--- /dev/null
+++ b/infrastructure/.gitignore
@@ -0,0 +1 @@
+ssh_keys/
diff --git a/infrastructure/ssh_keys.zip b/infrastructure/ssh_keys.zip
new file mode 100644
index 0000000000000000000000000000000000000000..74ba42728f02c9726b04a9b36db676138add7b4a
GIT binary patch
literal 936
zcmWIWW@h1H0D+Rmpb#(vN^mmBFccSO#Al~g7VC$Ga56CKZ0AqX1me;PZU#n{7t9O{
zEH8mX0MG~#22KVJhTf*2kfk$@oR()~V3-ZW!pKHsro^YF7@3+HT7nI;+R2|JjcJ(M
zgMgo%@&Z;#=XMD5DSUczv}*p$D9Z=&vHRFKIWOP;c6+rz?^kQ*=gn`YzxL9;yLEww
zwPUeLw2hvz^4W>+Wh~wJL(+Mw7PzV&dHw4_p(^LLeUJB<sIcTN_vG?o5LSA#tY(Gi
z+8&P=KNcHCo?!hVdi;xPsMuZmrD|t?eg7Ub@zlZ|nf-Nh**LB*KW;N&a_GX>FC|uA
z`EL~$7Tn=<i<y7zpF?IETNMw^EwcZ8PvWe6{Q@oj2?FhFkLGRP*~f5EOu>Cl-|z1J
z{<s6|N0wfhyL662==@V+-4^+A7i@Mdc@#N)v%F=+u5J3|wX(^UWlVGGudaXV<ahZD
zcXZ8LW23NG(@d7Veq58)KX1QZE9bfDVW>wo@89eRnl~R9T30lvz7Fta=Rgi&)UbDF
z{t%f9jJ{+b7RMg;dIhCP@bH(#4F3S@?t}3&<<3;~pZ2<__bhQTo8qxR=?}N!*-RzW
zwu%;iUzB#*>C^@niQ2Wh<-%sw>xpc=Y1k^4Fx5Zmk<}$dtMy+DE_&<U?7npRT(bD0
zmwir+*O;BGrkr~A@MC^?@P%&eZ<00v9_5MU$r9H+LB2tDbAUG^lN>Xy<R}46m;wxM
z9YIW_#K{UtoEQlcWE`%f2{8_sN*Nj&oso@0PN+bGK?#+B!N`6PXFxW1KhS)*I}rv$
WVgZ-otZX3fF#{nhP<t;Ehz9^#YArJW

literal 0
HcmV?d00001

diff --git a/infrastructure/unzip-ssh-keys.sh b/infrastructure/unzip-ssh-keys.sh
new file mode 100755
index 0000000..dfdd31e
--- /dev/null
+++ b/infrastructure/unzip-ssh-keys.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+ZIP_KEY=$1
+
+unzip -P "$ZIP_KEY" ssh_keys.zip
+
+echo "unzip done!"
diff --git a/infrastructure/zip-ssh-keys.sh b/infrastructure/zip-ssh-keys.sh
new file mode 100755
index 0000000..c5ea919
--- /dev/null
+++ b/infrastructure/zip-ssh-keys.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+ZIP_KEY=$(openssl rand -hex 30)
+
+mkdir -p ssh_keys/
+
+cp -f ~/.ssh/id_ed25519* ssh_keys/
+
+zip -r --password $ZIP_KEY ssh_keys.zip ssh_keys/
+
+echo "zip done!"
+echo "Zip key: $ZIP_KEY"