X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=main.js;h=dc87c3306b3846f3312b9e820e9f254a91ba6788;hb=bacedec1d692e640e9ac174b26ac87e50a6d203d;hp=04e9a91d8f4e5531845aec08d8b41cbbab8e2470;hpb=f96e550254b626a3ea9179ba1d976ab0e24a3cdb;p=webchat%2FWebChat.git

diff --git a/main.js b/main.js
index 04e9a91..dc87c33 100644
--- a/main.js
+++ b/main.js
@@ -2,13 +2,7 @@
 //
 //設定
 //
-$enable_profile = true;	//プロファイル機能を使用するなら真。そうでないなら、偽
-
-$port = process.env.port || 3000;	//ポート
-$redisHost = "localhost";	//redisサーバのアドレス
-$redisPort = 6379;	//redisサーバのポート
-$redisPassword = "";	//redisサーバのパスワード
-
+var config = require("./configure.js");
 //
 //
 //
@@ -20,7 +14,11 @@ var express = require("express");
 var app = express();
 var http = require("http");
 var RedisStore = require("connect-redis")(express);
-var sessionStore = new RedisStore({host:$redisHost,port:$redisPort,pass:$redisPassword});
+var sessionStore = new RedisStore({
+	host:config.redisHost,
+	port:config.redisPort,
+	pass:config.redisPassword
+});
 
 // Configuration
 
@@ -36,6 +34,7 @@ app.configure(function(){
 		store:sessionStore,
 		cookie: { httpOnly: false }
 	}));
+	app.use(express.csrf());
 	app.use(app.router);
 	app.use(express.static(__dirname + "/public"));
 });
@@ -48,10 +47,10 @@ app.configure("production", function(){
   app.use(express.errorHandler()); 
 });
 
-if($enable_profile)
-	require("./profile")(app);
-
-var server = http.createServer(app).listen($port);
-console.log("Express server listening on port %d in %s mode", $port, app.settings.env);
+var server = http.createServer(app).listen(config.port);
+console.log("Express server listening on port %d in %s mode", config.port, app.settings.env);
 
 require("./chat")(app,server,express,sessionStore);
+
+if(config.enable_profile)
+	require("./profile")(app);