From 7b4259478ed6e236774937ab613775e99e07fef1 Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Mon, 9 Jul 2018 21:36:56 +0200 Subject: [PATCH 1/5] Testcommit --- layouts/default.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/default.erb b/layouts/default.erb index f6c5383..3cae34b 100644 --- a/layouts/default.erb +++ b/layouts/default.erb @@ -6,7 +6,7 @@ - Zeus WPI | <%= item[:title] || 'Werkgroep Informatica van de Universiteit Gent' %> + Weus ZPI | <%= item[:title] || 'Werkgroep Informatica van de Universiteit Gent' %> From 1cc9b44b5c2495628a5b6de17b9bda0b90651d79 Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Mon, 9 Jul 2018 21:45:38 +0200 Subject: [PATCH 2/5] Set host keys instead of ignoring them --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5fb45a6..526f175 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ notifications: before_install: - openssl aes-256-cbc -K $encrypted_6059a4f451fd_key -iv $encrypted_6059a4f451fd_iv -in id_rsa.enc -out deploy_key -d -- echo -e "Host zeus.ugent.be\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config +- echo -e "[zeus.ugent.be]:2222 ecdsa-sha2-nistp256\nAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC87/Q3H8f7ghmA+iCtKGaNyk0fx3Z36Xrn+eGv8a4pD7MXeu6Uwr0aN5HnkcbRWXFtMwnAU3ptoP90vH7qu99w=\n[herbert.zeus.gent]:2222 ecdsa-sha2-nistp256\nAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGLnJMh2DgqpVnHxOmeV6KffvzZGEVfniq0NFHRGZoL4f7Uc8xeG9gn3cc7lCL02F9LwWZNwR4gSqhGt/RK2S54=\n" >> ~/.ssh/known_hosts - npm install script: - bundle exec nanoc --env=prod @@ -37,5 +37,4 @@ after_success: - mv deploy_key ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - chmod +x ./deploy.sh -- echo -e "Host $TRAVIS_PULL_REQUEST.zeus.werthen.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config - ./deploy.sh From dc3147deb600487b164d92bb336fdb1a451c4f2d Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Mon, 9 Jul 2018 21:53:46 +0200 Subject: [PATCH 3/5] Do known_hosts correctly --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 526f175..fdfac9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ notifications: before_install: - openssl aes-256-cbc -K $encrypted_6059a4f451fd_key -iv $encrypted_6059a4f451fd_iv -in id_rsa.enc -out deploy_key -d -- echo -e "[zeus.ugent.be]:2222 ecdsa-sha2-nistp256\nAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC87/Q3H8f7ghmA+iCtKGaNyk0fx3Z36Xrn+eGv8a4pD7MXeu6Uwr0aN5HnkcbRWXFtMwnAU3ptoP90vH7qu99w=\n[herbert.zeus.gent]:2222 ecdsa-sha2-nistp256\nAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGLnJMh2DgqpVnHxOmeV6KffvzZGEVfniq0NFHRGZoL4f7Uc8xeG9gn3cc7lCL02F9LwWZNwR4gSqhGt/RK2S54=\n" >> ~/.ssh/known_hosts +- echo -e "[zeus.ugent.be]:2222 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC87/Q3H8f7ghmA+iCtKGaNyk0fx3Z36Xrn+eGv8a4pD7MXeu6Uwr0aN5HnkcbRWXFtMwnAU3ptoP90vH7qu99w=\n[herbert.ugent.be]:2222 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGLnJMh2DgqpVnHxOmeV6KffvzZGEVfniq0NFHRGZoL4f7Uc8xeG9gn3cc7lCL02F9LwWZNwR4gSqhGt/RK2S54=\n" >> ~/.ssh/known_hosts - npm install script: - bundle exec nanoc --env=prod From ab627a7211d5742ac7ca607d9aaa3c88b47114b8 Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Mon, 9 Jul 2018 22:16:15 +0200 Subject: [PATCH 4/5] Deploy to public/ folder --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 93dcd1b..398c902 100755 --- a/deploy.sh +++ b/deploy.sh @@ -7,5 +7,5 @@ if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then bundle exec nanoc --env=prod deploy public fi else - rsync -e 'ssh -p 2222' -aglpPrtvz --delete output/ "zeuspr@herbert.ugent.be:/home/zeuspr/$TRAVIS_PULL_REQUEST/" + rsync -e 'ssh -p 2222' -aglpPrtvz --delete output/ "zeuspr@herbert.ugent.be:/home/zeuspr/public/$TRAVIS_PULL_REQUEST/" fi From f35edd6ca9d9728cd01908ab759eecd15cd92807 Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Mon, 9 Jul 2018 22:21:32 +0200 Subject: [PATCH 5/5] Fix Weus ZPI --- layouts/default.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/default.erb b/layouts/default.erb index 3cae34b..f6c5383 100644 --- a/layouts/default.erb +++ b/layouts/default.erb @@ -6,7 +6,7 @@ - Weus ZPI | <%= item[:title] || 'Werkgroep Informatica van de Universiteit Gent' %> + Zeus WPI | <%= item[:title] || 'Werkgroep Informatica van de Universiteit Gent' %>