Install fixes
This commit is contained in:
parent
9f9e75c99f
commit
6fdea32a50
@ -91,7 +91,7 @@ module.exports = (port, spinner) => {
|
|||||||
reject(new Error('Git is not installed or not reachable from PATH.'))
|
reject(new Error('Git is not installed or not reachable from PATH.'))
|
||||||
}
|
}
|
||||||
let gitver = _.chain(stdout.replace(/[^\d.]/g, '')).split('.').take(3).join('.').value()
|
let gitver = _.chain(stdout.replace(/[^\d.]/g, '')).split('.').take(3).join('.').value()
|
||||||
if (!semver.satisfies(semver.clean(gitver), '>=2.11.0')) {
|
if (!semver.satisfies(semver.clean(gitver), '>=2.7.4')) {
|
||||||
reject(new Error('Git version is too old. Minimum is v2.7.4.'))
|
reject(new Error('Git version is too old. Minimum is v2.7.4.'))
|
||||||
}
|
}
|
||||||
resolve('Git v' + gitver + ' detected. Minimum is v2.7.4.')
|
resolve('Git v' + gitver + ' detected. Minimum is v2.7.4.')
|
||||||
|
26
libs/auth.js
26
libs/auth.js
@ -192,26 +192,6 @@ module.exports = function (passport) {
|
|||||||
db.onReady.then(() => {
|
db.onReady.then(() => {
|
||||||
db.User.findOne({ provider: 'local', email: 'guest' }).then((c) => {
|
db.User.findOne({ provider: 'local', email: 'guest' }).then((c) => {
|
||||||
if (c < 1) {
|
if (c < 1) {
|
||||||
// Create root admin account
|
|
||||||
|
|
||||||
winston.info('[AUTH] No administrator account found. Creating a new one...')
|
|
||||||
db.User.hashPassword('admin123').then((pwd) => {
|
|
||||||
return db.User.create({
|
|
||||||
provider: 'local',
|
|
||||||
email: appconfig.admin,
|
|
||||||
name: 'Administrator',
|
|
||||||
password: pwd,
|
|
||||||
rights: [{
|
|
||||||
role: 'admin',
|
|
||||||
path: '/',
|
|
||||||
exact: false,
|
|
||||||
deny: false
|
|
||||||
}]
|
|
||||||
})
|
|
||||||
}).then(() => {
|
|
||||||
winston.info('[AUTH] Administrator account created successfully!')
|
|
||||||
}).then(() => {
|
|
||||||
if (appdata.capabilities.guest) {
|
|
||||||
// Create guest account
|
// Create guest account
|
||||||
|
|
||||||
return db.User.create({
|
return db.User.create({
|
||||||
@ -227,12 +207,8 @@ module.exports = function (passport) {
|
|||||||
}]
|
}]
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
winston.info('[AUTH] Guest account created successfully!')
|
winston.info('[AUTH] Guest account created successfully!')
|
||||||
})
|
|
||||||
} else {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
winston.error('[AUTH] An error occured while creating administrator/guest account:')
|
winston.error('[AUTH] An error occured while creating guest account:')
|
||||||
winston.error(err)
|
winston.error(err)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -11,6 +11,7 @@ const zlib = require('zlib')
|
|||||||
const inquirer = require('inquirer')
|
const inquirer = require('inquirer')
|
||||||
const colors = require('colors/safe')
|
const colors = require('colors/safe')
|
||||||
const _ = require('lodash')
|
const _ = require('lodash')
|
||||||
|
const os = require('os')
|
||||||
|
|
||||||
let installDir = path.resolve(__dirname, '../..')
|
let installDir = path.resolve(__dirname, '../..')
|
||||||
|
|
||||||
@ -32,6 +33,11 @@ pm2.connectAsync().then(() => {
|
|||||||
}).catch(err => { // eslint-disable-line handle-callback-err
|
}).catch(err => { // eslint-disable-line handle-callback-err
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
|
}).then(() => {
|
||||||
|
if (os.totalmem() < 1024 * 1024 * 768) {
|
||||||
|
throw new Error('Not enough memory to install dependencies. Minimum is 768 MB.')
|
||||||
|
}
|
||||||
|
return true
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
/**
|
/**
|
||||||
* Fetch version from npm package
|
* Fetch version from npm package
|
||||||
|
Loading…
Reference in New Issue
Block a user