removed web and hooked client-share-web instead

mhammond · May 4, 2011 · 6a57250 · 6a57250
1 parent 7498ffc
commit 6a57250
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ BIN_DIR = bin
 endif
 
 APPNAME = server-shared-send
-DEPS = mozilla:server-core,github:server-share-core
+DEPS = mozilla:server-core,github:server-share-core,github:client-share-web
 VIRTUALENV = virtualenv
 NOSE = $(BIN_DIR)/nosetests
 NOSETESTS_ARGS = -s

diff --git a/build.py b/build.py
@@ -39,7 +39,7 @@
 
 
 CURDIR = os.path.dirname(__file__)
-REPOS = {'github': ('git', 'https://github.com/mozilla/%s.git'),
+REPOS = {'github': ('git', 'git://github.com/mozilla/%s.git'),
          'mozilla': ('hg', 'https://hg.mozilla.org/services/%s')}
 PYTHON = sys.executable
 

diff --git a/development.ini b/development.ini
@@ -96,7 +96,7 @@ use = egg:Paste#urlmap
 
 [app:home]
 use = egg:linkdrop#static
-document_root = %(here)s/web
+document_root = %(here)s/deps/client-share-web
 
 [app:api]
 use = egg:linkdrop

diff --git a/production.ini b/production.ini
@@ -64,6 +64,9 @@ use = egg:Paste#urlmap
 / = home
 /api = api
 
+#
+# This should be removed and the web pages directly served by nginx
+#
 [app:home]
 use = egg:linkdrop#static
 document_root = /var/www/f1