aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/initializers
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-11-14 17:31:26 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-11-27 19:40:51 +0100
commit350e31d6b64e4973dfa5e9f7b46841cb09aeb1ad (patch)
treef4191f3c04a5230fcf8ca3d6ca3248643fc4151d /server/initializers
parente34c85e527100c0b5c44567bd951e95be41b8d7e (diff)
downloadPeerTube-350e31d6b64e4973dfa5e9f7b46841cb09aeb1ad.tar.gz
PeerTube-350e31d6b64e4973dfa5e9f7b46841cb09aeb1ad.tar.zst
PeerTube-350e31d6b64e4973dfa5e9f7b46841cb09aeb1ad.zip
Follow works
Diffstat (limited to 'server/initializers')
-rw-r--r--server/initializers/checker.ts14
-rw-r--r--server/initializers/constants.ts5
-rw-r--r--server/initializers/installer.ts10
3 files changed, 23 insertions, 6 deletions
diff --git a/server/initializers/checker.ts b/server/initializers/checker.ts
index b69188f7e..317d59423 100644
--- a/server/initializers/checker.ts
+++ b/server/initializers/checker.ts
@@ -1,8 +1,8 @@
1import * as config from 'config' 1import * as config from 'config'
2
3import { promisify0 } from '../helpers/core-utils' 2import { promisify0 } from '../helpers/core-utils'
4import { OAuthClientModel } from '../models/oauth/oauth-client-interface'
5import { UserModel } from '../models/account/user-interface' 3import { UserModel } from '../models/account/user-interface'
4import { ApplicationModel } from '../models/application/application-interface'
5import { OAuthClientModel } from '../models/oauth/oauth-client-interface'
6 6
7// Some checks on configuration files 7// Some checks on configuration files
8function checkConfig () { 8function checkConfig () {
@@ -70,6 +70,13 @@ async function usersExist (User: UserModel) {
70 return totalUsers !== 0 70 return totalUsers !== 0
71} 71}
72 72
73// We get db by param to not import it in this file (import orders)
74async function applicationExist (Application: ApplicationModel) {
75 const totalApplication = await Application.countTotal()
76
77 return totalApplication !== 0
78}
79
73// --------------------------------------------------------------------------- 80// ---------------------------------------------------------------------------
74 81
75export { 82export {
@@ -77,5 +84,6 @@ export {
77 checkFFmpeg, 84 checkFFmpeg,
78 checkMissedConfig, 85 checkMissedConfig,
79 clientsExist, 86 clientsExist,
80 usersExist 87 usersExist,
88 applicationExist
81} 89}
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index e27d011fa..4a49c1ab3 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -226,6 +226,9 @@ const FRIEND_SCORE = {
226 MAX: 1000 226 MAX: 1000
227} 227}
228 228
229const SERVER_ACCOUNT_NAME = 'peertube'
230const ACTIVITY_PUB_ACCEPT_HEADER = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
231
229const ACTIVITY_PUB = { 232const ACTIVITY_PUB = {
230 COLLECTION_ITEMS_PER_PAGE: 10, 233 COLLECTION_ITEMS_PER_PAGE: 10,
231 VIDEO_URL_MIME_TYPES: [ 234 VIDEO_URL_MIME_TYPES: [
@@ -352,8 +355,10 @@ export {
352 PODS_SCORE, 355 PODS_SCORE,
353 PREVIEWS_SIZE, 356 PREVIEWS_SIZE,
354 REMOTE_SCHEME, 357 REMOTE_SCHEME,
358 ACTIVITY_PUB_ACCEPT_HEADER,
355 FOLLOW_STATES, 359 FOLLOW_STATES,
356 SEARCHABLE_COLUMNS, 360 SEARCHABLE_COLUMNS,
361 SERVER_ACCOUNT_NAME,
357 PRIVATE_RSA_KEY_SIZE, 362 PRIVATE_RSA_KEY_SIZE,
358 SORTABLE_COLUMNS, 363 SORTABLE_COLUMNS,
359 STATIC_MAX_AGE, 364 STATIC_MAX_AGE,
diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts
index 5221b81a5..c3521a9e4 100644
--- a/server/initializers/installer.ts
+++ b/server/initializers/installer.ts
@@ -3,8 +3,8 @@ import { UserRole } from '../../shared'
3import { logger, mkdirpPromise, rimrafPromise } from '../helpers' 3import { logger, mkdirpPromise, rimrafPromise } from '../helpers'
4import { createUserAccountAndChannel } from '../lib' 4import { createUserAccountAndChannel } from '../lib'
5import { createLocalAccount } from '../lib/user' 5import { createLocalAccount } from '../lib/user'
6import { clientsExist, usersExist } from './checker' 6import { applicationExist, clientsExist, usersExist } from './checker'
7import { CACHE, CONFIG, LAST_MIGRATION_VERSION } from './constants' 7import { CACHE, CONFIG, LAST_MIGRATION_VERSION, SERVER_ACCOUNT_NAME } from './constants'
8 8
9import { database as db } from './database' 9import { database as db } from './database'
10 10
@@ -128,9 +128,13 @@ async function createOAuthAdminIfNotExist () {
128} 128}
129 129
130async function createApplicationIfNotExist () { 130async function createApplicationIfNotExist () {
131 const exist = await applicationExist(db.Application)
132 // Nothing to do, application already exist
133 if (exist === true) return undefined
134
131 logger.info('Creating Application table.') 135 logger.info('Creating Application table.')
132 const applicationInstance = await db.Application.create({ migrationVersion: LAST_MIGRATION_VERSION }) 136 const applicationInstance = await db.Application.create({ migrationVersion: LAST_MIGRATION_VERSION })
133 137
134 logger.info('Creating application account.') 138 logger.info('Creating application account.')
135 return createLocalAccount('peertube', null, applicationInstance.id, undefined) 139 return createLocalAccount(SERVER_ACCOUNT_NAME, null, applicationInstance.id, undefined)
136} 140}