KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

trying to fix https issue

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-06-11 14:56:57 +02:00
parent 690ccc1bc2
commit abdb3423fc
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/server.js
View File

@@ -1,8 +1,20 @@
var fs = require('fs');
var http = require('http');
var https = require('https');
var privateKey = fs.readFileSync('/etc/apache2/ssl/private.key', 'utf8');
var certificate = fs.readFileSync('/etc/apache2/ssl/ssl.crt', 'utf8');
var credentials = {key: privateKey, cert: certificate};
// your express configuration here
//var httpServer = http.createServer(app);
var httpsServer = https.createServer(credentials, app);
var express = require('express'); var express = require('express');
var app = express(); var app = express();
var server = require('http').createServer(app); //var server = require('http').createServer(app);
var io = require('socket.io')(server); var io = require('socket.io')(httpsServer);
//db //db
var mongojs = require('mongojs'); var mongojs = require('mongojs');
@@ -14,7 +26,7 @@ var crypto = require('crypto');
var port = 3000; var port = 3000;
var lists = []; var lists = [];
server.listen(port, function () { httpsServer.listen(port, function () {
console.log('Server listening at port %d', port); console.log('Server listening at port %d', port);
}); });

2
static/js/nochan.js
View File

@@ -82,7 +82,7 @@ $(document).ready(function (){
list_html = $("#channels").html(); list_html = $("#channels").html();
$("#channels").empty(); $("#channels").empty();
var socket = io.connect('//'+window.location.hostname+':3000'); var socket = io.connect('https://'+window.location.hostname+':3000');
var playlists = []; var playlists = [];
socket.emit('frontpage_lists'); socket.emit('frontpage_lists');
socket.on('playlists', function(msg){ socket.on('playlists', function(msg){