liz/wikijs-fork
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
agent.js
View File

@ -25,11 +25,13 @@ global.winston = require(CORE_PATH + 'core-libs/winston')(IS_DEBUG);
winston.info('[AGENT] Background Agent is initializing...');
var appconfig = require(CORE_PATH + 'core-libs/config')('./config.yml');
global.db = require(CORE_PATH + 'core-libs/mongodb').init(appconfig);
global.upl = require('./libs/uploads-agent').init(appconfig);
global.git = require('./libs/git').init(appconfig);
global.entries = require('./libs/entries').init(appconfig);
let appconf = require(CORE_PATH + 'core-libs/config')();
global.appconfig = appconf.config;
global.appdata = appconf.data;
global.db = require(CORE_PATH + 'core-libs/mongodb').init();
global.upl = require('./libs/uploads-agent').init();
global.git = require('./libs/git').init();
global.entries = require('./libs/entries').init();
global.mark = require('./libs/markdown');
// ----------------------------------------

48
app/data.yml Normal file
View File

@ -0,0 +1,48 @@
# ---------------------------------
# DO NOT EDIT THIS FILE!
# This is reserved for system use!
# ---------------------------------
name: Wiki.js
capabilities:
guest: true
rights: true
manyAuthProviders: true
defaults:
config:
title: Wiki
host: http://localhost
port: 80
paths:
repo: ./repo
data: ./data
uploads:
maxImageFileSize: 3,
maxOtherFileSize: 100
lang: en
public: false
auth:
local:
enabled: true
microsoft:
enabled: false
google:
enabled: false
facebook:
enabled: false
db: mongodb://localhost/wiki
sessionSecret: null
admin: null
git:
url: null
branch: master
auth:
type: basic
username: null
password: null
publicKey: null
privateKey: null
sslVerify: true
signature:
name: Wiki
email: wiki@example.com
# ---------------------------------

3
libs/entries.js
View File

@ -18,10 +18,9 @@ module.exports = {
/**
* Initialize Entries model
*
* @param {Object} appconfig The application config
* @return {Object} Entries model instance
*/
init(appconfig) {
init() {
let self = this;

3
libs/git.js
View File

@ -34,10 +34,9 @@ module.exports = {
/**
* Initialize Git model
*
* @param {Object} appconfig The application config
* @return {Object} Git model instance
*/
init(appconfig) {
init() {
let self = this;

5
libs/local.js
View File

@ -9,8 +9,6 @@ var path = require('path'),
/**
* Local Data Storage
*
* @param {Object} appconfig The application configuration
*/
module.exports = {
@ -22,10 +20,9 @@ module.exports = {
/**
* Initialize Local Data Storage model
*
* @param {Object} appconfig The application config
* @return {Object} Local Data Storage model instance
*/
init(appconfig) {
init() {
this._uploadsPath = path.resolve(ROOTPATH, appconfig.paths.repo, 'uploads');
this._uploadsThumbsPath = path.resolve(ROOTPATH, appconfig.paths.data, 'thumbs');

7
libs/uploads-agent.js
View File

@ -13,9 +13,7 @@ var path = require('path'),
_ = require('lodash');
/**
* Uploads
*
* @param {Object} appconfig The application configuration
* Uploads - Agent
*/
module.exports = {
@ -27,10 +25,9 @@ module.exports = {
/**
* Initialize Uploads model
*
* @param {Object} appconfig The application config
* @return {Object} Uploads model instance
*/
init(appconfig) {
init() {
let self = this;

3
libs/uploads.js
View File

@ -23,10 +23,9 @@ module.exports = {
/**
* Initialize Local Data Storage model
*
* @param {Object} appconfig The application config
* @return {Object} Uploads model instance
*/
init(appconfig) {
init() {
this._uploadsPath = path.resolve(ROOTPATH, appconfig.paths.repo, 'uploads');
this._uploadsThumbsPath = path.resolve(ROOTPATH, appconfig.paths.data, 'thumbs');

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();

2
views/auth/login.pug
View File

@ -63,5 +63,5 @@ html
#copyright
= t('footer.poweredby') + ' '
a.icon(href='https://github.com/Requarks/wiki')
i.fa.fa-github
i.icon-github
a(href='https://github.com/Requarks/wiki') Requarks Wiki