From c6ebe502eff41054d897573e7ee463b04a2019dd Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gregor.kleen@ifi.lmu.de>
Date: Wed, 18 Dec 2019 17:54:48 +0100
Subject: [PATCH] chore(gitlab-ci): use single deploy key

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65f52e6ed..a87c68b4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
   POSTGRES_DB: uniworx_test
   POSTGRES_USER: uniworx
   POSTGRES_PASSWORD: uniworx
-  GIT_SSH_COMMAND: "ssh -vv -F ~/.ssh/config"
+  GIT_SSH_COMMAND: "ssh -v -F ~/.ssh/config"
   
 stages:
   - setup
@@ -37,7 +37,7 @@ npm install:
     - apt-get install openssh-client -y
     - install -v -m 0700 -d ~/.ssh
     - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
-    - for keyVar in ${!SSH_PRIVATE_KEY_NPM_*}; do install -v -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done
+    - install -v -T -m 0400 ${SSH_DEPLOY_KEY} ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config; 
   artifacts:
     paths:
       - node_modules/
@@ -86,7 +86,7 @@ yesod:build:dev:
     - apt-get install openssh-client -y
     - install -v -m 0700 -d ~/.ssh
     - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
-    - for keyVar in ${!SSH_PRIVATE_KEY_STACK_*}; do install -v -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done
+    - install -v -T -m 0400 ${SSH_DEPLOY_KEY} ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config; 
   artifacts:
     paths:
       - bin/
@@ -113,7 +113,7 @@ yesod:build:
     - apt-get install -y --no-install-recommends openssh-client
     - install -v -m 0700 -d ~/.ssh
     - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
-    - for keyVar in ${!SSH_PRIVATE_KEY_STACK_*}; do install -v -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done
+    - install -v -T -m 0400 ${SSH_DEPLOY_KEY} ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config; 
   artifacts:
     paths:
       - bin/
@@ -240,7 +240,7 @@ deploy:uniworx3:
     - apt-get install -y --no-install-recommends openssh-client
     - install -v -m 0700 -d ~/.ssh
     - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
-    - install -v -T -m 0400 ${SSH_PRIVATE_KEY_UNIWORX3} ~/.ssh/SSH_PRIVATE_KEY_UNIWORX3; echo "IdentityFile ~/.ssh/SSH_PRIVATE_KEY_UNIWORX3" >> ~/.ssh/config; 
+    - install -v -T -m 0400 ${SSH_PRIVATE_KEY_UNIWORX3} ~/.ssh/uniworx3; echo "IdentityFile ~/.ssh/uniworx3" >> ~/.ssh/config; 
   dependencies:
     - yesod:build