correct path to make it work, back to normal
authorymh <ymh.work@gmail.com>
Sat, 15 Oct 2011 23:41:36 +0200
changeset 6 6befc470b1e6
parent 5 17b1be7486d8
child 7 74cc78bbd65f
correct path to make it work, back to normal
.hgignore
web/.htaccess.tmpl
web/ldtplatform/.htaccess.mod_wsgi.tmpl
web/ldtplatform/__init__.py
web/ldtplatform/config.py.tmpl
web/ldtplatform/settings.py
web/log/.keepme
--- a/.hgignore	Sat Oct 15 02:20:18 2011 +0200
+++ b/.hgignore	Sat Oct 15 23:41:36 2011 +0200
@@ -11,4 +11,8 @@
 
 
 syntax: regexp
-^virtualenv/web/project-boot\.py$
\ No newline at end of file
+^virtualenv/web/project-boot\.py$
+syntax: regexp
+^web/ldtplatform/\.htaccess$
+syntax: regexp
+^web/ldtplatform/config\.py$
\ No newline at end of file
--- a/web/.htaccess.tmpl	Sat Oct 15 02:20:18 2011 +0200
+++ b/web/.htaccess.tmpl	Sat Oct 15 23:41:36 2011 +0200
@@ -1,1 +1,1 @@
-RedirectMatch permanent /~ymh/platform/?$ /~ymh/platform/platform
+RedirectMatch permanent /~ymh/regardssignes/?$ /~ymh/regardssignes/ldtplatform
--- a/web/ldtplatform/.htaccess.mod_wsgi.tmpl	Sat Oct 15 02:20:18 2011 +0200
+++ b/web/ldtplatform/.htaccess.mod_wsgi.tmpl	Sat Oct 15 23:41:36 2011 +0200
@@ -1,7 +1,7 @@
 
 SetEnv DJANGO_SETTINGS_MODULE ldtplatform.settings
-SetEnv PROJECT_PATH /iridata/users/wakimd/hg/platform/web
-SetEnv PYTHON_PATH /iridata/users/wakimd/Env/Efculture/lib/python2.6/site-packages
+SetEnv PROJECT_PATH /Users/ymh/dev/workspace/regardssignes/web
+SetEnv PYTHON_PATH /Users/ymh/dev/workspace/regardssignes/virtualenv/web/env/venv_rs/lib/python2.7/site-packages
 
 Options ExecCGI FollowSymLinks
 SetHandler wsgi-script
@@ -12,7 +12,7 @@
 
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ /dev/~wakimd/platform/ldtplatform/modwsgi.wsgi/$1 [QSA,PT,L]
+RewriteRule ^(.*)$ /~ymh/regardssignes/ldtplatform/modwsgi.wsgi/$1 [QSA,PT,L]
 
 Header set Pragma "no-cache"
 Header set Cache-Control "no-cache"
--- a/web/ldtplatform/__init__.py	Sat Oct 15 02:20:18 2011 +0200
+++ b/web/ldtplatform/__init__.py	Sat Oct 15 23:41:36 2011 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 3, 0, "final", 0)
+VERSION = (0, 1, 0, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
--- a/web/ldtplatform/config.py.tmpl	Sat Oct 15 02:20:18 2011 +0200
+++ b/web/ldtplatform/config.py.tmpl	Sat Oct 15 23:41:36 2011 +0200
@@ -5,21 +5,20 @@
 BASE_DIR = os.path.dirname(os.path.abspath(__file__)).rstrip("/")+"/"
 BASE_URL = '/~ymh/platform/'
 WEB_URL = 'http://localhost/'
-STATIC_URL = BASE_URL + 'static/site/'
-
-
-STREAM_URL = "rtmp://localhost/vod/media/"
 
 STREAM_SRC_PREFIX = ""
  
 BASE_STATIC_ROOT = os.path.abspath(BASE_DIR + "../static/").rstrip("/")+"/"
 BASE_STATIC_URL = BASE_URL + 'static/' 
 
+STREAM_URL = BASE_STATIC_URL + "/content/"
+
+
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = BASE_STATIC_ROOT + "media/"
 
-
+STATIC_URL = BASE_STATIC_URL + 'site/'
 # 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 = BASE_STATIC_ROOT + "site/"
@@ -51,12 +50,10 @@
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
-#LOG_FILE = os.path.abspath(os.path.join(BASE_DIR,"../log/log.txt"))
-LOG_FILE = os.path.abspath(os.path.join(BASE_DIR,"log/log.txt"))
+LOG_FILE = os.path.abspath(os.path.join(BASE_DIR,"../log/log.txt"))
 LOG_LEVEL = logging.DEBUG
 
-#INDEX_PATH = os.path.abspath(BASE_DIR + "../index/")
-INDEX_PATH = os.path.abspath(BASE_DIR + "index/")
+INDEX_PATH = os.path.abspath(BASE_DIR + "../index/")
 
 
 ADMINS = (
--- a/web/ldtplatform/settings.py	Sat Oct 15 02:20:18 2011 +0200
+++ b/web/ldtplatform/settings.py	Sat Oct 15 23:41:36 2011 +0200
@@ -1,20 +1,6 @@
 #@PydevCodeAnalysisIgnore
 import os.path
-#import ldtplatform
-VERSION = (0, 3, 0, "final", 0)
-VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
-def get_version():
-    version = '%s.%s' % (VERSION[0], VERSION[1])
-    if VERSION[2]:
-        version = '%s.%s' % (version, VERSION[2])
-    if VERSION[3:] == ('alpha', 0):
-        version = '%s pre-alpha' % version
-    else:
-        if VERSION[3] != 'final':
-            version = '%s %s %s' % (version, VERSION[3], VERSION[4])
-    return version
-__version__ = get_version()
-
+import ldtplatform
 # Django settings for project.
 
 DEBUG = True
@@ -115,8 +101,7 @@
 )
 
 
-#ROOT_URLCONF = 'ldtplatform.urls'
-ROOT_URLCONF = 'urls'
+ROOT_URLCONF = 'ldtplatform.urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -139,7 +124,7 @@
     'django.contrib.messages',
     'django.contrib.admin',
     'django.contrib.staticfiles',
-    #'ldtplatform',
+    'ldtplatform',
     'registration',
     'tagging',
     'ldt',
@@ -217,24 +202,23 @@
 
 AUTO_INDEX_AFTER_SAVE = True
 
-#WEB_VERSION = ldtplatform.get_version()
-WEB_VERSION = get_version()
+WEB_VERSION = ldtplatform.get_version()
 
 from config import *
 
 if not "LOGIN_URL" in locals():
-    LOGIN_URL = BASE_URL + 'accounts/login/'
+    LOGIN_URL = BASE_URL + 'ldtplatform/accounts/login/'
 if not "LOGOUT_URL" in locals():
-    LOGOUT_URL = BASE_URL + 'accounts/disconnect/'
+    LOGOUT_URL = BASE_URL + 'ldtplatform/accounts/disconnect/'
 if not "LOGIN_REDIRECT_URL" in locals():
-    LOGIN_REDIRECT_URL = BASE_URL + 'ldt/'
+    LOGIN_REDIRECT_URL = BASE_URL + 'ldtplatform/ldt/'
 if not "LOGOUT_REDIRECT_URL" in locals():
-    LOGOUT_REDIRECT_URL = BASE_URL + 'accounts/login'
+    LOGOUT_REDIRECT_URL = BASE_URL + 'ldtplatform/accounts/login'
 if not "PROFILE_REDIRECT_URL" in locals():
-    PROFILE_REDIRECT_URL = BASE_URL + 'auth_accounts/create/profile'
+    PROFILE_REDIRECT_URL = BASE_URL + 'ldtplatform/auth_accounts/create/profile'
 
 if not "LOGIN_ERROR_URL" in locals():
-    LOGIN_ERROR_URL = BASE_URL + 'accounts/login'
+    LOGIN_ERROR_URL = BASE_URL + 'ldtplatform/accounts/login'
 
 if not "GLOBAL_LOG_LEVEL" in locals():
     GLOBAL_LOG_LEVEL = LOG_LEVEL