KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-01-01 15:16:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #293 from zoff-music/refactor/adminpanel

Browse Source 
Trying to fix error
This commit is contained in:
Kasper Rynning-Tønnesen
2018-02-05 20:00:04 +01:00
committed by GitHub
parent 3d2bd86284 4fb88537cb
commit 00e9083d09
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/app.js
View File

@@ -57,6 +57,8 @@ function startClustered(redis_enabled) {
function startSingle(clustered, redis_enabled) { function startSingle(clustered, redis_enabled) {
var client = require('./client.js'); var client = require('./client.js');
var admin = require('./admin.js'); var admin = require('./admin.js');
var server;
var admin_server;
try { try {
var cert_config = require(path.join(path.join(__dirname, 'config'), 'cert_config.js')); var cert_config = require(path.join(path.join(__dirname, 'config'), 'cert_config.js'));
var fs = require('fs'); var fs = require('fs');
@@ -71,14 +73,16 @@ function startSingle(clustered, redis_enabled) {
var https = require('https'); var https = require('https');
server = https.Server(credentials, client); server = https.Server(credentials, client);
admin_server = https.Server(credentials, admin);
} catch(err){ } catch(err){
console.log("Starting without https (probably on localhost)"); console.log("Starting without https (probably on localhost)");
server = http.Server(client); server = http.Server(client);
admin_server = http.Server(admin);
//add = ",http://localhost:80*,http://localhost:8080*,localhost:8080*, localhost:8082*,http://zoff.dev:80*,http://zoff.dev:8080*,zoff.dev:8080*, zoff.dev:8082*"; //add = ",http://localhost:80*,http://localhost:8080*,localhost:8080*, localhost:8082*,http://zoff.dev:80*,http://zoff.dev:8080*,zoff.dev:8080*, zoff.dev:8082*";
} }
admin_server = http.Server(admin);
if(clustered) { if(clustered) {
app app