Skip to content
This repository was archived by the owner on Mar 2, 2022. It is now read-only.

Commit 08d8417

Browse files
author
Dennis Schwartz
committed
Merge branch 'develop'
2 parents 0da4f2b + 35aeef0 commit 08d8417

17 files changed

+1861
-1609
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ root = true
22

33
[*]
44
charset = utf-8
5-
indent_style = space
5+
indent_style = tab
66
indent_size = 2
77
end_of_line = lf
88
insert_final_newline = true

.travis.yml

Lines changed: 51 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,54 @@
1-
# specify language
21
language: node_js
3-
4-
# specify NodeJS version
52
node_js:
6-
- "8.11.0"
7-
8-
# configure chrome
9-
before_install:
10-
- export CHROME_BIN=chromium-browser
11-
- export DISPLAY=:99.0
12-
- sh -e /etc/init.d/xvfb start
13-
14-
# install dependencies
15-
install:
16-
- npm install
17-
18-
# run unit tests only
19-
script:
20-
- npm run unit
21-
22-
# get notified through email
3+
- 10.15.0
4+
services:
5+
- docker
6+
jobs:
7+
include:
8+
- stage: test
9+
before_install:
10+
- export CHROME_BIN=chromium-browser
11+
- export DISPLAY=:99.0
12+
- sh -e /etc/init.d/xvfb start
13+
install:
14+
- npm install
15+
script:
16+
- npm run unit
17+
- stage: deploy-dev
18+
if: branch = develop
19+
before_script:
20+
- docker pull philm/ansible_playbook
21+
- git clone -b master https://github.com/biojs/biojs-backend-ansible.git
22+
- openssl aes-256-cbc -K $encrypted_89f8a6cbe683_key -iv $encrypted_89f8a6cbe683_iv
23+
-in deployment-key.enc -out ~/.ssh/id_rsa -d
24+
script:
25+
- docker run -it -v ~/.ssh/id_rsa:/root/.ssh/id_rsa -v "$(pwd)/biojs-backend-ansible":/ansible/playbooks
26+
-e DB_USER=$DB_USER
27+
-e DB_PASSWORD=$DB_PASSWORD
28+
-e GITHUB_CLIENT_SECRET=$GITHUB_CLIENT_SECRET
29+
-e GITHUB_CLIENT_ID=$GITHUB_CLIENT_ID
30+
philm/ansible_playbook dev-deploy.yml
31+
--private-key=~/.ssh/id_rsa -u ubuntu -i dev_hosts
32+
- stage: deploy-production
33+
if: branch = production
34+
before_script:
35+
- docker pull philm/ansible_playbook
36+
- git clone -b production https://github.com/biojs/biojs-backend-ansible.git
37+
- openssl aes-256-cbc -K $encrypted_89f8a6cbe683_key -iv $encrypted_89f8a6cbe683_iv
38+
-in deployment-key.enc -out ~/.ssh/id_rsa -d
39+
script:
40+
- docker run -it -v ~/.ssh/id_rsa:/root/.ssh/id_rsa -v "$(pwd)/biojs-backend-ansible":/ansible/playbooks
41+
-e DB_USER=$DB_USER
42+
-e DB_PASSWORD=$DB_PASSWORD
43+
-e GITHUB_CLIENT_SECRET=$GITHUB_CLIENT_SECRET
44+
-e GITHUB_CLIENT_ID=$GITHUB_CLIENT_ID
45+
philm/ansible_playbook production-deploy.yml
46+
--private-key=~/.ssh/id_rsa -u ubuntu -i production_hosts
2347
notifications:
24-
email: true
48+
email: true
49+
env:
50+
global:
51+
- secure: r3HCwCd5xPZtJBxXPNLMoi6B4EE5XzpeDMZl0kt+5o7H/L9C70TB+gADahxE/MXXORJVAAEVETcWNZDvAFxz7hFXEpnCtkhe+QPAcAPPma6IWve7HVdt5/dW1wYt2/nauHFZU40R2VgLcJR487TiI911nOnJSRnL3Wea3RdwtdDpIWH4jndQYxdzQY5Pso+g12+BZflWbDqXNg3zRt4gKLW2wz3DKXigVC5De43fEID2okmjLVJmqjPYr1lh1eEroytW64icMpVq7J8Hxc0WED0w9WDqG5MAlfPuj2GvEEEh0CFchv15SeJXkrcv/32IPuCqJthnw4Pp/F67YeYLAOPKI2N5ihyc9qCs6/mTSrSn+M3I1mgVqJwZqS7Sf1aHWAB+d42WOAPvzsGP2XZqfnl14z9z708nV7aleMRBJgclnmAIeaCsVDXZRvrxpNWuYz0WWfWfRV2fhmWkPvpY1hqlPxpcCiCEZ7s2HDb5zumX89rfzjFRrFqzL2DRFOJbczKYaIeCpWFPuMQ0C0FmjAfugpTcmTNQ0VGiM4HoeGz6f7M5CEf/WYBe5Ul7MLsu3i5XmttSUk6w2qPBwUNe7cFmFlTpch1HSCx1W/cqaCnc5xapIhTI627GZ/d2L0bQ1pmPcjzOfOksNwM74VSZSfEMDh1hsHWY0L/9yOtalQg=
52+
- secure: iY6aA7xsztmRP1YXvJhro2ys/N0f/84/fofU6Z659G7AtREqcWHqVE9yGVnjp6gRd1klaxuz5VBZ0DoxWQkLZle2wlf+HH7mPG/qPPvvhjt+L9eMbH4RHRy/COwo1CRD3e+PIpRE8Y6pMnWFZXnF3yPGfz9yfdTa0zuEKUnEW0IdiUSxeEbv2ycg+dAsQjsna4cfmFsNqkdU1RZ3tGANkLs8rINzeY1OuWPhlpubMZpDV+gIqjS1rBbvbVVTuRING4e0rLI/O09fAIPuppOR0OUWZ1rQh1ePMaLam2tbpKwFP60g3kUdk519X++/xqvtmwrfnLxnFozkqyC0bCETrqBqHbn5/pr71b7+tQJCI7vWbT9NF7nObLRdwxm/Stp65ueYEk6N5kkGKHFLjRhWqeTFy0VhsOODlGzgh/h52RDZsDw9kVbT63vGQ+Tr/Ldj1DcrsztkaH7Ds6lpFwjFfda11DwYSy/BwGDIFtStK/C7E3dwg9JQMydgGi7IXQ6dOftyaav9VZKUDxGjgBSMniYHc0h+XXdzUs1oEM6rt86w+hSbEdWMV3NcaueSHEX8fVQEnEYz860PGkQg6+AJdigB3Vl/uBNzo/vL8A+db0Ouyn2ve3dlxRCRCv7h/Tw0wuwT0STO4Bb3Rlxb3M9irimXNXcpxGUPM+4uXJ0RCYU=
53+
- secure: pyIl115rhcldQ+PRgdnYmjsdQnxgCbdlNy1xXbqdWLVer/zPg+UyD2oHDb6NKrmDvwbobS3x5EWiGZQz2ZQOF6CzpSk9+wS2HgQ6ZSHKSeK/sehVw0x6XwBS7wsuj4Ki+hEiB8RYaQRGLyf6KYdTuW9TRi/inQS/wud7BIqeCG14OWwa11CTQJzLBLsHlm/ExOBUm3JBGc63atB73U7QGT9/RBuH/X/OKasFfvQTGP88sDMbQwLBoKP3mphOajxVBig/GrmenFJD14c6FH1rfBFtlrRACU7DgXuR1jlxYweiU/yOvnM3hpTDU4fwnSIpxP4MbWHCmWOycPo/9GEXLfC+CUfiYN+PV7N1CSe8zuNjSifkXiN6Q0aNmVdFBN92e3Y2FCfvgFyDd7C+zVK+poumGngsXPOjFxD1tWwHX3y8i+b2kmdhQJr+QNe4YiVZ5PPipoRyKwcqpa2C4OBofg55U66LhItHznjJVWUAI5HozerdlRqi6S+OoN7KKMiMUYIzX7XgVEBYPku47NNi8gT+6umJUTrvlbKwThFvU8yE5Kz0VckrFZFHnuMq6Cyjr70ZiJj1cPD/uSbt9raAX3mmXbNkeG+urrn+64c8T3DeqfrOlMT9yBGVqvZZv7PV1RshvffqxQvqu2+J/Uri1yboIVhIH0Ec/R9HB00vWNY=
54+
- secure: Ctzk/IPWZ0ouADlfM6f+qQU+StIhjuLDG9DBey5paLmhybMyhrvizQg3Dy4LGgLKzjnn6F9iZkl0LBQh7Ghb3Qhg95bwEYVU1ZYNZhW5SW+Q/3aZzTx/waS6UaxraWc/c6xb65GlnOqD0zSnnuorNQUZL7HCRCmaWL+Gw+NLeZC6M1H/2JWhxCMOB1ZPSz8a7aq4E0rNnJJM0VAF1+r4U/BUMv/lNphVBQypfSCCtJwa4QMmd9l5cyMzP67KBbpzK3nnZtzUTb8wPedKpzvUOqIItCKkm8t4eMEz0E5lS3b0jhKjix9gPpxoHsJ2IqnyD+7ai8ALUouwxogLHNmzouxk5vVvC5ZsfUe6pARLmyaO7VxSK72liLn2KcYdiVYcLsTmEKwxGY9Prs2kKfHao6y/Fo7xYuLr8IR2nro8iizRsqnfHTtsVFKVYEC80BQ3ssXsVOugRLY8YK5wH4jikF3RFFuG8qpcm/UJ18vUBtVZCzqpUgoAoXeczF+s6tVYPNBXN+WdYDWMqrTXB6+DxnBCFeKj0rQanI7ZWb0+tGraiHb1CoQrbV6hkky1Ge/x/B/1mdmjLNnRMxIXDBXosq5PcAE7S3MxIFo5H8ISZUEaZmgi0QdVQuHlrYDdF0wwbouuky3urjCjnyn+dfXQz6/egIGY9WoI4oMwBlahMwg=

deployment-key.enc

1.81 KB
Binary file not shown.

index.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,14 @@
1515
<body>
1616
<div id="app"></div>
1717
<!-- built files will be auto injected -->
18+
<!-- Global site tag (gtag.js) - Google Analytics -->
19+
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-123362059-2"></script>
20+
<script>
21+
window.dataLayer = window.dataLayer || [];
22+
function gtag(){dataLayer.push(arguments);}
23+
gtag('js', new Date());
24+
25+
gtag('config', 'UA-123362059-2');
26+
</script>
1827
</body>
1928
</html>

0 commit comments

Comments
 (0)