Cemal
/
iut-hapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge conflicts

master
Devin Ivy 2021-04-11 23:24:33 -04:00 committed by cemal
parent e687d46de5
commit ca9558f401
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server/manifest.js
View File

@ -13,14 +13,14 @@ module.exports = new Confidence.Store({
server: {
host: 'localhost',
port: {
$param: 'PORT',
$env: 'PORT',
$coerce: 'number',
$default: 3000
},
debug: {
$filter: 'NODE_ENV',
$filter: { $env: 'NODE_ENV' },
$default: {
log: ['error', 'start'],
log: ['error'],
request: ['error']
},
production: {
@ -35,15 +35,9 @@ module.exports = new Confidence.Store({
options: {}
},
{
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
plugin: './plugins/swagger'
=======
=======
>>>>>>> 66973ef ((flavor) objection v3.0.0)
=======
>>>>>>> 66973ef ((flavor) objection v3.0.0)
},
{
plugin: '@hapipal/schwifty',
options: {
$filter: 'NODE_ENV',
@ -65,17 +59,10 @@ module.exports = new Confidence.Store({
migrateOnStart: false
}
}
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 66973ef ((flavor) objection v3.0.0)
=======
>>>>>>> 66973ef ((flavor) objection v3.0.0)
=======
>>>>>>> 66973ef ((flavor) objection v3.0.0)
},
{
plugin: {
$filter: 'NODE_ENV',
$filter: { $env: 'NODE_ENV' },
$default: '@hapipal/hpal-debug',
production: Toys.noop
}