Browse Source

Submodule updates

Nathaniel van Diepen 10 years ago
parent
commit
c9261c973c
5 changed files with 16 additions and 7 deletions
  1. 2 2
      .gitignore
  2. 3 3
      .gitmodules
  3. 9 2
      app/OmnomIRC.js
  4. 1 0
      app/node_modules/node-static
  5. 1 0
      app/node_modules/socket.io

+ 2 - 2
.gitignore

@@ -169,5 +169,5 @@ config.php
 # cloud9 files
 .c9revisions
 
-server/node_modules/socket.io
-server/node_modules/npm-debug.log
+app/node_modules/npm-debug.log
+app/node_modules/.bin

+ 3 - 3
.gitmodules

@@ -1,6 +1,6 @@
-[submodule "socket.io"]
+[submodule "app/node_modules/socket.io"]
 	path = app/node_modules/socket.io
 	url = https://github.com/LearnBoost/socket.io.git
-[submodule "node-static"]
+[submodule "app/node_modules/node-static"]
 	path = app/node_modules/node-static
-	url= https://github.com/cloudhead/node-static.git
+	url = https://github.com/cloudhead/node-static.git

+ 9 - 2
app/OmnomIRC.js

@@ -1,5 +1,12 @@
-var static = require('node-static'),
-	io = require('socket.io').listen(9000);
+#!node
+var fileServer = (new require('node-static')).Server('./www'),
+	app = require('http').createServer(function(req,res){
+		req.addListener('end',function(){
+			console.log('request made for '+req.url);
+			fileServer.serve(req,res);
+		}).resume();
+	}).listen(80),
+	io = require('socket.io').listen(app);
 io.sockets.on('connection',function(socket){
 	socket.on('join',function(data){
 		socket.join(data.name);

+ 1 - 0
app/node_modules/node-static

@@ -0,0 +1 @@
+Subproject commit bff5299e8d7a7d3512c13021021679ff6e2b1991

+ 1 - 0
app/node_modules/socket.io

@@ -0,0 +1 @@
+Subproject commit 64f6b244b6bd79880ba2e0ba00778a2309b39d0b