From 7a440ab19f974948f5958f7ebc0df826e98e5cfb Mon Sep 17 00:00:00 2001
From: Zaran <zaran.krleza@gmail.com>
Date: Wed, 20 Apr 2011 11:01:06 +0200
Subject: Add a js configuration file to avoid work conflicts.

Copy the config.js.sample to config.js and set the bosh server and
server component in there. Don't commit the file config.js.

Note: the file config.js will have to be merged with alias.js in
production
---
 .gitignore                     | 1 +
 webclient/index.html           | 1 +
 webclient/lib/alias.js         | 3 ---
 webclient/lib/config.js.sample | 2 ++
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 webclient/lib/config.js.sample

diff --git a/.gitignore b/.gitignore
index ad519ae..f84dda7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .pydevproject
 .settings/
 config.ini
+config.js
diff --git a/webclient/index.html b/webclient/index.html
index 107e17d..93cb286 100644
--- a/webclient/index.html
+++ b/webclient/index.html
@@ -8,6 +8,7 @@
     <title>Alias</title>
     <script type="text/javascript" src="lib/jquery-1.4.4.js"></script>
     <script type="text/javascript" src="lib/strophe.min.js"></script>
+    <script type="text/javascript" src="lib/config.js"></script>  
     <script type="text/javascript" src="lib/alias.js"></script>
     <script type="text/javascript" src="lib/sjcl.js"></script>
     <link rel="stylesheet" type="text/css" href="style/alias.css" />
diff --git a/webclient/lib/alias.js b/webclient/lib/alias.js
index 9b43abf..bae01cc 100644
--- a/webclient/lib/alias.js
+++ b/webclient/lib/alias.js
@@ -1,6 +1,3 @@
-var BOSH_SERVICE = 'http://localhost/http-bind';
-var server_component = 'object.localhost';
-
 /**
  * Alias namespace
  */
diff --git a/webclient/lib/config.js.sample b/webclient/lib/config.js.sample
new file mode 100644
index 0000000..9339c27
--- /dev/null
+++ b/webclient/lib/config.js.sample
@@ -0,0 +1,2 @@
+var BOSH_SERVICE = 'http://alias.im/http-bind';
+var server_component = 'social.alias.im';
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2