# HG changeset patch # User ymh # Date 1353054690 -3600 # Node ID 0cdd0bb4141c1a94200a50079d05b8cf7be0dcb6 # Parent ef14949a553d84c8744725d8b60d7ffd95b57299 correct proxy diff -r ef14949a553d -r 0cdd0bb4141c sbin/sync/config.py.tmpl --- a/sbin/sync/config.py.tmpl Fri Nov 16 09:25:20 2012 +0100 +++ b/sbin/sync/config.py.tmpl Fri Nov 16 09:31:30 2012 +0100 @@ -3,7 +3,7 @@ env.hosts = ['hp@54.248.83.51'] env.web_group = 'nginx' -env.folders = {'ldt': ['index', 'log', 'static/media'], 'hp': ['static', 'src/log'] } +env.folders = {'ldt': ['index', 'log', 'static/media'], 'hp': ['../static', '../static/media','log'] } env.local_folders = { 'ldt' : 'ldt/web', @@ -91,7 +91,7 @@ 'db_port': 0, 'base_url' : '/hp', 'ldt_netloc' : '54.248.83.51', - 'ldt_baseurl': '/', + 'ldt_baseurl': '/ldt/', 'ldt_url' : 'ldtplatform/', }, } diff -r ef14949a553d -r 0cdd0bb4141c src/hp/config.py.tmpl --- a/src/hp/config.py.tmpl Fri Nov 16 09:25:20 2012 +0100 +++ b/src/hp/config.py.tmpl Fri Nov 16 09:31:30 2012 +0100 @@ -38,7 +38,7 @@ # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash. # Examples: "http://media.lawrence.com/media/", "http://example.com/media/" -MEDIA_URL = BASE_STATIC_URL + "media" +MEDIA_URL = BASE_STATIC_URL + "media/" # Absolute path to the directory static files should be collected to. # Don't put anything in this directory yourself; store your static files diff -r ef14949a553d -r 0cdd0bb4141c src/hp/views.py --- a/src/hp/views.py Fri Nov 16 09:25:20 2012 +0100 +++ b/src/hp/views.py Fri Nov 16 09:31:30 2012 +0100 @@ -84,7 +84,7 @@ logger.debug("Proxy r url : " + r.url) logger.debug("Proxy r method : " + r.request.method) logger.debug("Proxy r full url : " + r.request.full_url) - logger.debug("Proxy r status : " + r.status_code) + logger.debug("Proxy r status : " + str(r.status_code)) logger.debug("Proxy r text : " + r.text) return HttpResponse(content=r.text, content_type='application/json;charset=UTF-8')