diff options
-rw-r--r-- | .travis.yml | 24 | ||||
-rw-r--r-- | src/utils.js | 2 | ||||
-rw-r--r-- | test/api/multiplePods.js | 2 |
3 files changed, 26 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..1729160f1 --- /dev/null +++ b/.travis.yml | |||
@@ -0,0 +1,24 @@ | |||
1 | language: node_js | ||
2 | |||
3 | node_js: | ||
4 | - "0.12" | ||
5 | |||
6 | sudo: false | ||
7 | |||
8 | services: | ||
9 | - mongodb | ||
10 | |||
11 | cache: | ||
12 | directories: | ||
13 | - node_modules | ||
14 | - $(npm config get prefix)/bin/grunt-cli | ||
15 | - $(npm config get prefix)/bin/electron-prebuilt | ||
16 | |||
17 | before_script: | ||
18 | - npm install electron-prebuilt -g | ||
19 | - npm install grunt-cli -g | ||
20 | |||
21 | after_failure: | ||
22 | - cat test1/logs/all-logs.log | ||
23 | - cat test2/logs/all-logs.log | ||
24 | - cat test3/logs/all-logs.log | ||
diff --git a/src/utils.js b/src/utils.js index 82a62c43f..7a5c7b7ea 100644 --- a/src/utils.js +++ b/src/utils.js | |||
@@ -125,7 +125,7 @@ | |||
125 | } | 125 | } |
126 | 126 | ||
127 | logger.debug('Gen RSA keys...') | 127 | logger.debug('Gen RSA keys...') |
128 | openssl.exec('genrsa', { 'out': utils.certDir + 'peertube.key.pem' }, function (err) { | 128 | openssl.exec('genrsa', { 'out': utils.certDir + 'peertube.key.pem', '2048': false }, function (err) { |
129 | if (err) { | 129 | if (err) { |
130 | logger.error('Cannot create private key on this pod.', { error: err }) | 130 | logger.error('Cannot create private key on this pod.', { error: err }) |
131 | return callback(err) | 131 | return callback(err) |
diff --git a/test/api/multiplePods.js b/test/api/multiplePods.js index 81d4b06b6..511c1b975 100644 --- a/test/api/multiplePods.js +++ b/test/api/multiplePods.js | |||
@@ -65,7 +65,7 @@ | |||
65 | done() | 65 | done() |
66 | }) | 66 | }) |
67 | }) | 67 | }) |
68 | }, 1000) | 68 | }, 5000) |
69 | }) | 69 | }) |
70 | }) | 70 | }) |
71 | }) | 71 | }) |