X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Finstaller.ts;h=b02be956702505add2383ba165777c202f692f13;hb=db312c7023bb8263741255f8af1c8a6aef5f88f7;hp=c1899824414d9c9d2dff7d4ccce1b127de27d0fa;hpb=21d70a7302c0d03ae8cc538a97d4b279c4da5792;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts index c18998244..b02be9567 100644 --- a/server/initializers/installer.ts +++ b/server/initializers/installer.ts @@ -1,5 +1,8 @@ import { ensureDir, readdir, remove } from 'fs-extra' import passwordGenerator from 'password-generator' +import { join } from 'path' +import { isTestOrDevInstance } from '@server/helpers/core-utils' +import { getNodeABIVersion } from '@server/helpers/version' import { UserRole } from '@shared/models' import { logger } from '../helpers/logger' import { buildUser, createApplicationActor, createUserAccountAndChannelAndPlaylist } from '../lib/user' @@ -67,7 +70,7 @@ async function removeDirectoryOrContent (dir: string) { const files = await readdir(dir) for (const file of files) { - await remove(file) + await remove(join(dir, file)) } } } @@ -134,8 +137,8 @@ async function createOAuthAdminIfNotExist () { let validatePassword = true let password = '' - // Do not generate a random password for tests - if (process.env.NODE_ENV === 'test') { + // Do not generate a random password for test and dev environments + if (isTestOrDevInstance()) { password = 'test' if (process.env.NODE_APP_INSTANCE) { @@ -173,7 +176,9 @@ async function createApplicationIfNotExist () { logger.info('Creating application account.') const application = await ApplicationModel.create({ - migrationVersion: LAST_MIGRATION_VERSION + migrationVersion: LAST_MIGRATION_VERSION, + nodeVersion: process.version, + nodeABIVersion: getNodeABIVersion() }) return createApplicationActor(application.id)