1
0
mirror of https://github.com/moparisthebest/kaiwa synced 2025-02-16 07:00:09 -05:00

Cleanup config/server to reference OTalk instead of Conversat.io/And Bang

This commit is contained in:
Lance Stout 2013-06-04 15:38:51 -07:00
parent 84e5623c5c
commit f1b3e98675
3 changed files with 6 additions and 19 deletions

View File

@ -1,9 +1,5 @@
{ {
"isDev": true, "isDev": true,
"auth": {
"id": "conversat.io-dev",
"secret": "conversat.io-dev-secret"
},
"http": { "http": {
"baseUrl": "https://localhost:8000", "baseUrl": "https://localhost:8000",
"port": 8000 "port": 8000

View File

@ -1,17 +1,16 @@
{ {
"name": "conversat.io", "name": "otalk.im",
"description": "Easiest/best group video chat service on the planet.", "description": "OTalk: WebRTC Enabled XMPP Client, in the Browser",
"version": "0.0.1", "version": "0.0.1",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@github.com:andyet/conversat.io.git" "url": "git@github.com:andyet/otalk.git"
}, },
"dependencies": { "dependencies": {
"express": "3.x.x", "express": "3.x.x",
"connect": "2.7.6", "connect": "2.7.6",
"connect-redis": "1.4.5", "connect-redis": "1.4.5",
"getconfig": "0.0.5", "getconfig": "0.0.5",
"andbang-express-auth": "0.0.9",
"yetify": "0.0.1", "yetify": "0.0.1",
"jade": "0.30.0", "jade": "0.30.0",
"moonboots": "0.0.3", "moonboots": "0.0.3",

View File

@ -8,7 +8,6 @@ var fs = require('fs'),
connect = require('connect'), connect = require('connect'),
RedisStore = require('connect-redis')(connect), RedisStore = require('connect-redis')(connect),
https = require('https'), https = require('https'),
andbangAuth = require('andbang-express-auth'),
Moonboots = require('moonboots'), Moonboots = require('moonboots'),
config = require('getconfig'), config = require('getconfig'),
yetify = require('yetify'), yetify = require('yetify'),
@ -33,18 +32,11 @@ app.use(express.session({
maxAge: 1000 * 60 * 60 * 24 * 90, // 90 days maxAge: 1000 * 60 * 60 * 24 * 90, // 90 days
secure: config.session.secure secure: config.session.secure
}, },
key: 'c.io' key: 'o.im'
}));
app.use(andbangAuth.middleware({
app: app,
clientId: config.auth.id,
clientSecret: config.auth.secret,
defaultRedirect: '/',
local: config.isDev
})); }));
var clientApp = new Moonboots({ var clientApp = new Moonboots({
fileName: 'conversat.io', fileName: 'otalk',
dir: __dirname + '/clientapp', dir: __dirname + '/clientapp',
developmentMode: config.isDev, developmentMode: config.isDev,
libraries: [ libraries: [
@ -71,4 +63,4 @@ app.get('/help*', semiStatic({
app.get('*', clientApp.html()); app.get('*', clientApp.html());
server.listen(config.http.port); server.listen(config.http.port);
console.log('conversat.io, by ' + yetify.logo() + ' running at: ' + config.http.baseUrl); console.log('otalk.im, by ' + yetify.logo() + ' running at: ' + config.http.baseUrl);