liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added appdata support

Browse Source
This commit is contained in:
NGPixel
2017-01-09 22:45:56 -05:00
parent ec6f32d29c
commit f8161f2e7a
9 changed files with 71 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server.js
View File

@@ -25,14 +25,16 @@ winston.info('[SERVER] Wiki.js is initializing...');
// Load global modules
// ----------------------------------------
var appconfig = require(CORE_PATH + 'core-libs/config')('./config.yml');
global.lcdata = require('./libs/local').init(appconfig);
global.db = require(CORE_PATH + 'core-libs/mongodb').init(appconfig);
global.entries = require('./libs/entries').init(appconfig);
global.git = require('./libs/git').init(appconfig, false);
let appconf = require(CORE_PATH + 'core-libs/config')();
global.appconfig = appconf.config;
global.appdata = appconf.data;
global.lcdata = require('./libs/local').init();
global.db = require(CORE_PATH + 'core-libs/mongodb').init();
global.entries = require('./libs/entries').init();
global.git = require('./libs/git').init(false);
global.lang = require('i18next');
global.mark = require('./libs/markdown');
global.upl = require('./libs/uploads').init(appconfig);
global.upl = require('./libs/uploads').init();
// ----------------------------------------
// Load modules
@@ -87,7 +89,7 @@ app.use(express.static(path.join(ROOTPATH, 'assets')));
// Passport Authentication
// ----------------------------------------
var strategy = require(CORE_PATH + 'core-libs/auth')(passport, appconfig);
var strategy = require(CORE_PATH + 'core-libs/auth')(passport);
global.rights = require(CORE_PATH + 'core-libs/rights');
rights.init();