Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

just add a little bit code refactoring #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports.admin_userid = process.env.ADMIN_USERID;
/*module.exports.admin_userid = process.env.ADMIN_USERID;

module.exports.sitename = process.env.SITENAME;
module.exports.siteurl = process.env.SITEURL;
Expand All @@ -9,4 +9,29 @@ module.exports.gh_consumer_key = process.env.GH_CONSUMER_KEY;
module.exports.gh_consumer_secret = process.env.GH_CONSUMER_SECRET;
module.exports.gh_callback = process.env.GH_CALLBACK;

module.exports.express_session_secret = process.env.EXPRESS_SESSION_SECRET;
module.exports.express_session_secret = process.env.EXPRESS_SESSION_SECRET;*/

/**
* You can even config for different enviroment
* module.exports = {development: {}, production: {}}
*
*
*/
module.exports = {

admin_userid: process.env.ADMIN_USERID,

sitename: process.env.SITENAME,

siteurl: process.env.SITEURL,

mongo_uri: process.env.MONGOLAB_URI,

gh_consumer_key: process.env.GH_CONSUMER_KEY,

gh_consumer_secret: process.env.GH_CONSUMER_SECRET,

gh_callback: process.env.GH_CALLBACK,

express_session_secret: process.env.EXPRESS_SESSION_SECRET
};
37 changes: 37 additions & 0 deletions config/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*module.exports.admin_userid = process.env.ADMIN_USERID;

module.exports.sitename = process.env.SITENAME;
module.exports.siteurl = process.env.SITEURL;

module.exports.mongo_uri = process.env.MONGOLAB_URI;

module.exports.gh_consumer_key = process.env.GH_CONSUMER_KEY;
module.exports.gh_consumer_secret = process.env.GH_CONSUMER_SECRET;
module.exports.gh_callback = process.env.GH_CALLBACK;

module.exports.express_session_secret = process.env.EXPRESS_SESSION_SECRET;*/

/**
* You can even config for different enviroment
* module.exports = {development: {}, production: {}}
*
*
*/
module.exports = {

admin_userid: process.env.ADMIN_USERID,

sitename: process.env.SITENAME,

siteurl: process.env.SITEURL,

mongo_uri: process.env.MONGOLAB_URI,

gh_consumer_key: process.env.GH_CONSUMER_KEY,

gh_consumer_secret: process.env.GH_CONSUMER_SECRET,

gh_callback: process.env.GH_CALLBACK,

express_session_secret: process.env.EXPRESS_SESSION_SECRET
};
46 changes: 46 additions & 0 deletions config/express.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
var express = require('express'),
MongoStore = require('connect-mongo')(express);

module.exports = function (app, config) {

app.use(express.static(__dirname + '/public'));

app.set('views', __dirname + '/views');
app.set('view engine', 'jade');

app.configure(function () {

// cookieParser should above session
app.use(express.cookieParser());

// use urlencoded and json to fix connection 3.0 warning
app.use(express.urlencoded());
app.use(express.json());
app.use(express.methodOverride());

// express/mongo session storage
app.use(express.session({
secret: config.express_session_secret,
store: new MongoStore({
url: config.mongo_uri,
db: 'pushserver_sessions',
clear_interval: 600
}, function () {
console.log('connected to mongo!');
})
}));

// routes should be at last
app.use(app.router);
});

// development env config
app.configure('development', function () {
app.use(express.errorHandler({ dumpException: true, showStack: true }));
});

// production env config
app.configure('production', function () {
app.use(express.errorHandler());
});
}
Loading