Merge branch 'apigen'

[plstackapi.git] / planetstack / planetstack / urls.py

diff --git a/planetstack/planetstack/urls.py b/planetstack/planetstack/urls.py
index 9dceea9..599b20b 100644 (file)
--- a/planetstack/planetstack/urls.py
+++ b/planetstack/planetstack/urls.py
@@ -18,14 +18,21 @@ from core.views.slivers import SliverList, SliverDetail
 from core.views.tags import TagList, TagDetail
 from genapi import UserList, UserDetail
 from core.views.legacyapi import LegacyXMLRPC
+#from core.views.analytics import AnalyticsAjaxView
 from core.models import *
 from core.api_root import api_root
 from rest_framework import generics
-from core.plus.sites import SitePlus
+from core.dashboard.sites import SitePlus
+from django.http import HttpResponseRedirect
 
 admin.site = SitePlus()
 admin.autodiscover()
 
+def redirect_to_apache(request):
+     """ bounce a request back to the apache server that is running on the machine """
+     apache_url = "http://%s%s" % (request.META['HOSTNAME'], request.path)
+     return HttpResponseRedirect(apache_url)
+
 urlpatterns = patterns('',
     # Examples:
     # url(r'^$', 'planetstack.views.home', name='home'),
@@ -40,7 +47,7 @@ urlpatterns = patterns('',
     #url(r'^profile/home', 'core.views.home'),
 
     url(r'^plstackapi/$', api_root),
-    
+
     url(r'^plstackapi/deployments/$', DeploymentList.as_view(), name='deployment-list'),
     url(r'^plstackapi/deployments/(?P<pk>[a-zA-Z0-9\-]+)/$', DeploymentDetail.as_view(), name='deployment-detail'),
 
@@ -89,6 +96,9 @@ urlpatterns = patterns('',
 
     url(r'^legacyapi/$', 'core.views.legacyapi.LegacyXMLRPC', name='xmlrpc'),
 
+#    url(r'^analytics/(?P<name>\w+)/$', AnalyticsAjaxView.as_view(), name="analytics"),
+
+    url(r'^files/', redirect_to_apache),
 
     #Adding in rest_framework urls
     url(r'^plstackapi/', include('rest_framework.urls', namespace='rest_framework')),