Folder structure #398

Merged
bones7242 merged 76 commits from folder-structure into master 2018-03-20 00:01:08 +01:00
6 changed files with 6 additions and 5 deletions
Showing only changes of commit f840281b4c - Show all commits

View file

@ -11,6 +11,7 @@ function SiteConfig () {
sessionKey: 'default',
};
this.details = {
port : 3000,
title : 'Spee.ch',
host : 'default',
description: 'Open-source, decentralized image and video sharing.',

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -12,7 +12,6 @@ const http = require('http');
const logger = require('winston');
function SpeechServer ({ mysqlConfig, siteConfig, slackConfig }) {
this.PORT = 3000;
this.start = () => {
this.configureConfigFiles();
this.configureLogging();
@ -25,6 +24,7 @@ function SpeechServer ({ mysqlConfig, siteConfig, slackConfig }) {
mysqlAppConfig.configure(mysqlConfig);
const siteAppConfig = require('./config/siteConfig.js');
siteAppConfig.configure(siteConfig);
this.PORT = siteAppConfig.details.port;
const slackAppConfig = require('./config/slackConfig.js');
slackAppConfig.configure(slackConfig);
};