# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1305560560 -7200
# Node ID b823ac24bc8825a17497429252401457fb4fbd5d
# Parent  13744108acaed98153ce45597a7dd6ccbcb72260
update psycopg2 + settings template

diff -r 13744108acae -r b823ac24bc88 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Mon May 16 12:06:50 2011 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Mon May 16 17:42:40 2011 +0200
@@ -41,7 +41,7 @@
     })
 else:
     URLS.update({
-        'PSYCOPG2': {'setup': 'psycopg2','url': 'http://initd.org/psycopg/tarballs/PSYCOPG-2-3/psycopg2-2.3.2.tar.gz', 'local':"psycopg2-2.3.2.tar.gz"},
+        'PSYCOPG2': {'setup': 'psycopg2','url': 'http://www.psycopg.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-2.4.tar.gz', 'local':"psycopg2-2.4.tar.gz"},
         'PYLUCENE': {'setup': 'pylucene', 'url': 'http://apache.crihan.fr/dist//lucene/pylucene/pylucene-3.1.0-1-src.tar.gz', 'local':"pylucene-3.1.0-1-src.tar.gz"},
         'PIL': {'setup': 'pil', 'url': 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', 'local':"Imaging-1.1.7.tar.gz"},
         'LXML': {'setup': 'lxml', 'url':"lxml-2.3.tar.bz2", 'local':"lxml-2.3.tar.bz2"}
diff -r 13744108acae -r b823ac24bc88 virtualenv/res/src/psycopg2-2.3.2.tar.gz
Binary file virtualenv/res/src/psycopg2-2.3.2.tar.gz has changed
diff -r 13744108acae -r b823ac24bc88 virtualenv/res/src/psycopg2-2.4.tar.gz
Binary file virtualenv/res/src/psycopg2-2.4.tar.gz has changed
diff -r 13744108acae -r b823ac24bc88 web/ldtplatform/config.py.tmpl
--- a/web/ldtplatform/config.py.tmpl	Mon May 16 12:06:50 2011 +0200
+++ b/web/ldtplatform/config.py.tmpl	Mon May 16 17:42:40 2011 +0200
@@ -15,12 +15,12 @@
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = os.path.abspath(BASE_DIR + "../static/")
+MEDIA_ROOT = os.path.abspath(BASE_DIR + "../static/").rstrip("/")+"/"
 
 
 # Absolute path to the directory that static files (js, css, swf...)
 # DO NOT forget to do command line ./manage.py collectstatic to gather static media into the web/static folder
-STATIC_ROOT = "C:/user/myfolder/my_platform/platform/web/static"
+STATIC_ROOT = MEDIA_ROOT + "site/"
 
 
 CONTENT_ROOT = MEDIA_ROOT + "media/content/"
diff -r 13744108acae -r b823ac24bc88 web/ldtplatform/settings.py
--- a/web/ldtplatform/settings.py	Mon May 16 12:06:50 2011 +0200
+++ b/web/ldtplatform/settings.py	Mon May 16 17:42:40 2011 +0200
@@ -209,8 +209,11 @@
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/'
+if not "ADMIN_MEDIA_PREFIX" in locals():
+    ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/'
 # Used in a lot of templates
-LDT_MEDIA_PREFIX = STATIC_URL + 'ldt/'
+if not "LDT_MEDIA_PREFIX" in locals():
+    LDT_MEDIA_PREFIX = STATIC_URL + 'ldt/'
 # URL that handles the media served from MEDIA_ROOT.
-MEDIA_URL = BASE_URL + 'static/media/'
+if not "MEDIA_URL" in locals():
+    MEDIA_URL = BASE_URL + 'static/media/'