From cbc1ab14fd500a47dbda48cd148a26c01aacbb20 Mon Sep 17 00:00:00 2001
From: Christian Franke <nobody@nowhere.ws>
Date: Tue, 18 Mar 2014 01:27:08 +0100
Subject: Konfiguration fuer Nebenwohnung

---
 public/js/cctv-control.js |  4 ++--
 server.js                 | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/public/js/cctv-control.js b/public/js/cctv-control.js
index 70c68e9..6db2932 100644
--- a/public/js/cctv-control.js
+++ b/public/js/cctv-control.js
@@ -12,8 +12,8 @@
 // This Software is licensed under the GPL Version 3, 29 June 2007
 
 var cam = 0;
-var camHost = "127.0.0.1:8080";
-var controlHost = "127.0.0.1:8080";
+var camHost = "192.168.1.20:8080";
+var controlHost = "192.168.1.20:8080";
 var formActive = 0; //crazy errors if boolean is used here...
 
 //create event which is triggered when DOM is ready 
diff --git a/server.js b/server.js
index cdcee8d..e941992 100644
--- a/server.js
+++ b/server.js
@@ -11,36 +11,36 @@ var app = express();
 
 var cameras = [
 	{
-		baseurl: 'http://192.168.1.20:8080/cam/0',
-		model: 'mjpegplexer'
+		baseurl: 'http://admin:123456@192.168.1.10',
+		model: 'conceptronic'
 	},
 	{
-		baseurl: 'http://192.168.1.20:8080/cam/1',
-		model: 'mjpegplexer'
+		baseurl: 'http://admin:123456@192.168.1.11',
+		model: 'conceptronic'
 	},
 	{
-		baseurl: 'http://192.168.1.20:8080/cam/2',
-		model: 'mjpegplexer'
+		baseurl: 'http://admin:123456@192.168.1.12',
+		model: 'conceptronic'
 	},
 	{
-		baseurl: 'http://192.168.1.20:8080/cam/3',
-		model: 'mjpegplexer'
+		baseurl: 'http://admin:123456@192.168.1.14',
+		model: 'conceptronic'
 	},
 	{
-		baseurl: 'http://192.168.1.20:8080/cam/4',
-		model: 'mjpegplexer'
+		baseurl: 'http://admin:123456@192.168.1.15',
+		model: 'conceptronic'
 	},
 	{
-		baseurl: 'http://192.168.1.20:8080/cam/5',
-		model: 'mjpegplexer'
+		baseurl: 'http://admin:123456@192.168.1.16',
+		model: 'conceptronic'
 	},
 	{
-		baseurl: 'http://192.168.1.20:8080/cam/6',
-		model: 'mjpegplexer'
+		baseurl: 'http://admin:123456@192.168.1.17',
+		model: 'conceptronic'
 	},
 	{
-		baseurl: 'http://192.168.1.20:8080/cam/7',
-		model: 'mjpegplexer'
+		baseurl: 'http://admin:123456@192.168.1.18',
+		model: 'conceptronic'
 	}
 ];
 
-- 
cgit v1.2.1