Permalink
Browse files

Merge branch 'master' of nodester.com:/node/git/tuna/464-92e501a9b101…

…69b311db6e49ce7a1f07

Conflicts:
	boatduinode.js
  • Loading branch information...
2 parents 03f136a + 35234cc commit 74a59fb318f5eb74ecb99e0c0e579977adc1a9aa @supertunaman committed Jan 1, 2012
Showing with 10 additions and 22 deletions.
  1. +1 −0 .gitignore
  2. +7 −20 boatduinode.js
  3. +1 −1 boatduinode.rb
  4. +1 −1 public/index.html
View
@@ -0,0 +1 @@
+.nodester.appconfig
View
@@ -1,24 +1,5 @@
-/* Copyright (C) 2011 by ath (@supertunaman)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE. */
-
var http = require('http');
+<<<<<<< HEAD
var io = require('socket.io');
var express = require('express');
@@ -50,3 +31,9 @@ socket.on('connection', function(client) {
})
});
+=======
+http.createServer(function (req, res) {
+ res.writeHead(200, {'Content-Type': 'text/plain'});
+ res.end('Hello World\nApp (boatduinode) is running..');
+}).listen(8617);
+>>>>>>> 35234ccb07ae7934a5b974b1db955cd8a1401075
View
@@ -24,7 +24,7 @@
@serial = SerialPort.new("/dev/ttyUSB0", 9600, 8, 1, SerialPort::NONE)
#@ws = WebSocket.new "ws://localhost:8080/socket.io/websocket"
-@ws = WebSocket.new "ws://boatduinode.nodester.com/socket.io/websocket"
+@ws = WebSocket.new "ws://boatduinode.nodester.com:80/socket.io/websocket"
puts "Connected"
def up
View
@@ -18,7 +18,7 @@
<script src="http://boatduinode.nodester.com/socket.io/socket.io.js"></script>
<script>
//var socket = new io.Socket("localhost");
-var socket = new io.Socket("http://boatduinode.nodester.com");
+var socket = new io.Socket("http://boatduinode.nodester.com:80");
socket.connect();
socket.on('connect', function(){ })
socket.on('message', function(){ })

0 comments on commit 74a59fb

Please sign in to comment.