aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-01-05 14:15:32 +0100
committerChocobozzz <me@florianbigard.com>2018-01-05 14:15:32 +0100
commit6b467fd54e58edb77dade400380581485a484434 (patch)
treea1c65182a4ee71269c680d15d2ad935e2c8b7280
parentd7e70384a360cda51fe23712331110a5c8b1124c (diff)
downloadPeerTube-6b467fd54e58edb77dade400380581485a484434.tar.gz
PeerTube-6b467fd54e58edb77dade400380581485a484434.tar.zst
PeerTube-6b467fd54e58edb77dade400380581485a484434.zip
Fix tls and account bug
-rw-r--r--server.ts3
-rw-r--r--server/initializers/constants.ts2
-rw-r--r--server/initializers/migrations/0160-account-route.ts42
3 files changed, 46 insertions, 1 deletions
diff --git a/server.ts b/server.ts
index 05fc39acb..a52c47083 100644
--- a/server.ts
+++ b/server.ts
@@ -1,3 +1,6 @@
1// FIXME: https://github.com/nodejs/node/pull/16853
2require('tls').DEFAULT_ECDH_CURVE = 'auto'
3
1import { isTestInstance } from './server/helpers/core-utils' 4import { isTestInstance } from './server/helpers/core-utils'
2 5
3if (isTestInstance()) { 6if (isTestInstance()) {
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 1f18b4401..f8e6b52d7 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -9,7 +9,7 @@ import { isTestInstance, root, sanitizeHost, sanitizeUrl } from '../helpers/core
9 9
10// --------------------------------------------------------------------------- 10// ---------------------------------------------------------------------------
11 11
12const LAST_MIGRATION_VERSION = 155 12const LAST_MIGRATION_VERSION = 160
13 13
14// --------------------------------------------------------------------------- 14// ---------------------------------------------------------------------------
15 15
diff --git a/server/initializers/migrations/0160-account-route.ts b/server/initializers/migrations/0160-account-route.ts
new file mode 100644
index 000000000..cab4c72f1
--- /dev/null
+++ b/server/initializers/migrations/0160-account-route.ts
@@ -0,0 +1,42 @@
1import * as Sequelize from 'sequelize'
2
3async function up (utils: {
4 transaction: Sequelize.Transaction,
5 queryInterface: Sequelize.QueryInterface,
6 sequelize: Sequelize.Sequelize
7}): Promise<void> {
8 {
9 const toReplace = ':443'
10 const by = ''
11 const replacer = column => `replace("${column}", '${toReplace}', '${by}')`
12
13 const query = `
14 UPDATE actor SET url = ${replacer('url')}, "inboxUrl" = ${replacer('inboxUrl')}, "outboxUrl" = ${replacer('outboxUrl')},
15 "sharedInboxUrl" = ${replacer('sharedInboxUrl')}, "followersUrl" = ${replacer('followersUrl')},
16 "followingUrl" = ${replacer('followingUrl')}
17 `
18 await utils.sequelize.query(query)
19 }
20
21 {
22 const toReplace = '/account/'
23 const by = '/accounts/'
24 const replacer = column => `replace("${column}", '${toReplace}', '${by}')`
25
26 const query = `
27 UPDATE actor SET url = ${replacer('url')}, "inboxUrl" = ${replacer('inboxUrl')}, "outboxUrl" = ${replacer('outboxUrl')},
28 "sharedInboxUrl" = ${replacer('sharedInboxUrl')}, "followersUrl" = ${replacer('followersUrl')},
29 "followingUrl" = ${replacer('followingUrl')}
30 `
31 await utils.sequelize.query(query)
32 }
33}
34
35function down (options) {
36 throw new Error('Not implemented.')
37}
38
39export {
40 up,
41 down
42}