Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
191f00cc
Commit
191f00cc
authored
Mar 30, 2017
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow ENV variable as MongoDB conn string
parent
d13085ac
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
73 additions
and
2 deletions
+73
-2
agent.js
agent.js
+1
-1
config.sample.yml
config.sample.yml
+1
-0
db.js
libs/db.js
+70
-0
server.js
server.js
+1
-1
No files found.
agent.js
View file @
191f00cc
...
@@ -28,7 +28,7 @@ winston.info('[AGENT] Background Agent is initializing...')
...
@@ -28,7 +28,7 @@ winston.info('[AGENT] Background Agent is initializing...')
let
appconf
=
require
(
CORE_PATH
+
'core-libs/config'
)()
let
appconf
=
require
(
CORE_PATH
+
'core-libs/config'
)()
global
.
appconfig
=
appconf
.
config
global
.
appconfig
=
appconf
.
config
global
.
appdata
=
appconf
.
data
global
.
appdata
=
appconf
.
data
global
.
db
=
require
(
CORE_PATH
+
'core-libs/mongo
db'
).
init
()
global
.
db
=
require
(
'./libs/
db'
).
init
()
global
.
upl
=
require
(
'./libs/uploads-agent'
).
init
()
global
.
upl
=
require
(
'./libs/uploads-agent'
).
init
()
global
.
git
=
require
(
'./libs/git'
).
init
()
global
.
git
=
require
(
'./libs/git'
).
init
()
global
.
entries
=
require
(
'./libs/entries'
).
init
()
global
.
entries
=
require
(
'./libs/entries'
).
init
()
...
...
config.sample.yml
View file @
191f00cc
...
@@ -105,6 +105,7 @@ admin: admin@company.com
...
@@ -105,6 +105,7 @@ admin: admin@company.com
# ---------------------------------------------------------------------
# ---------------------------------------------------------------------
# Database Connection String
# Database Connection String
# ---------------------------------------------------------------------
# ---------------------------------------------------------------------
# You can also use an ENV variable by using $ENV_VAR_NAME as the value
db
:
mongodb://localhost:27017/wiki
db
:
mongodb://localhost:27017/wiki
...
...
libs/db.js
0 → 100644
View file @
191f00cc
'use strict'
/* global ROOTPATH, appconfig, winston */
const
modb
=
require
(
'mongoose'
)
const
fs
=
require
(
'fs'
)
const
path
=
require
(
'path'
)
const
_
=
require
(
'lodash'
)
/**
* MongoDB module
*
* @return {Object} MongoDB wrapper instance
*/
module
.
exports
=
{
/**
* Initialize DB
*
* @return {Object} DB instance
*/
init
()
{
let
self
=
this
global
.
Mongoose
=
modb
let
dbModelsPath
=
path
.
resolve
(
ROOTPATH
,
'models'
)
modb
.
Promise
=
require
(
'bluebird'
)
// Event handlers
modb
.
connection
.
on
(
'error'
,
err
=>
{
winston
.
error
(
'Failed to connect to MongoDB instance.'
)
return
err
})
modb
.
connection
.
once
(
'open'
,
function
()
{
winston
.
log
(
'Connected to MongoDB instance.'
)
})
// Store connection handle
self
.
connection
=
modb
.
connection
self
.
ObjectId
=
modb
.
Types
.
ObjectId
// Load DB Models
fs
.
readdirSync
(
dbModelsPath
)
.
filter
(
function
(
file
)
{
return
(
file
.
indexOf
(
'.'
)
!==
0
)
})
.
forEach
(
function
(
file
)
{
let
modelName
=
_
.
upperFirst
(
_
.
camelCase
(
_
.
split
(
file
,
'.'
)[
0
]))
self
[
modelName
]
=
require
(
path
.
join
(
dbModelsPath
,
file
))
})
// Using ENV variable?
if
(
_
.
startsWith
(
appconfig
.
db
,
'$'
))
{
appconfig
.
db
=
process
.
env
[
appconfig
.
db
.
slice
(
1
)]
}
// Connect
self
.
onReady
=
modb
.
connect
(
appconfig
.
db
)
return
self
}
}
server.js
View file @
191f00cc
...
@@ -33,7 +33,7 @@ winston.info('[SERVER] Wiki.js is initializing...')
...
@@ -33,7 +33,7 @@ winston.info('[SERVER] Wiki.js is initializing...')
// ----------------------------------------
// ----------------------------------------
global
.
lcdata
=
require
(
'./libs/local'
).
init
()
global
.
lcdata
=
require
(
'./libs/local'
).
init
()
global
.
db
=
require
(
CORE_PATH
+
'core-libs/mongo
db'
).
init
()
global
.
db
=
require
(
'./libs/
db'
).
init
()
global
.
entries
=
require
(
'./libs/entries'
).
init
()
global
.
entries
=
require
(
'./libs/entries'
).
init
()
global
.
git
=
require
(
'./libs/git'
).
init
(
false
)
global
.
git
=
require
(
'./libs/git'
).
init
(
false
)
global
.
lang
=
require
(
'i18next'
)
global
.
lang
=
require
(
'i18next'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment