diff --git a/deploy.json b/deploy.json index b2b35cb..e219bc6 100644 --- a/deploy.json +++ b/deploy.json @@ -12,7 +12,9 @@ "ecosystem": "../secrets/e2e-test/ecosystem-staging.json", "assets": { "release": "../release", - "cloudron": "../cloudron-cli" + "cloudron": "../cloudron-cli", + "id_rsa_e2e_selfhost": "../secrets/e2e-test/ssh/id_rsa_e2e_selfhost", + "id_rsa_e2e_selfhost.pub": "../secrets/e2e-test/ssh/id_rsa_e2e_selfhost.pub" } } } diff --git a/prepareDeployTarget.sh b/prepareDeployTarget.sh index b31d1f4..07e552e 100644 --- a/prepareDeployTarget.sh +++ b/prepareDeployTarget.sh @@ -12,6 +12,7 @@ readonly CERTS_DIR="/home/ubuntu/certs" readonly APP_REPO_DIR="/home/ubuntu/app.git" readonly INIT_MASTER_DIR="/tmp/repoMasterSetup" readonly ECOSYSTEM="/home/ubuntu/ecosystem.json" +readonly SSH_KEY_DIR="/home/ubuntu/ssh_keys" readonly SERVER_NAME="<%= serverName %>" readonly ENV="<%= env %>" @@ -45,6 +46,11 @@ ln -sf /usr/local/node-4.2.2/bin/node /usr/bin/node ln -sf /usr/local/node-4.2.2/bin/npm /usr/bin/npm npm config set prefix /usr/local +# copy ssh certs +rm -rf "${SSH_KEY_DIR}" && mkdir -p "${SSH_KEY_DIR}" +mv /tmp/id_rsa* "${SSH_KEY_DIR}" +chmod 600 ${SSH_KEY_DIR}/id_rsa_* + # install tmpreaper (runs everyday and clean tmp) apt-get install -y tmpreaper sed -e 's/SHOWWARNING=true/# SHOWWARNING=true/' -i /etc/tmpreaper.conf