diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py index 0b14a52..c25e768 100644 --- a/src/colab/custom_settings.py +++ b/src/colab/custom_settings.py @@ -169,6 +169,9 @@ SOLR_BASE_QUERY = """ ((Type:changeset OR Type:ticket OR Type:wiki OR Type:thread) AND Title:["" TO *]) """ +COLAB_TRAC_URL = 'http://colab-backend.interlegis.leg.br/' + +REVPROXY_ADD_REMOTE_USER = True try: from local_settings import * diff --git a/src/colab/urls.py b/src/colab/urls.py index 1cdfd72..d19fb2a 100644 --- a/src/colab/urls.py +++ b/src/colab/urls.py @@ -1,21 +1,24 @@ + from django.conf.urls import patterns, include, url +from django.conf import settings from django.views.generic import TemplateView from django.contrib import admin + admin.autodiscover() urlpatterns = patterns('', url(r'^$', 'colab.deprecated.views.other.home', name='home'), - + url(r'^search/$', 'colab.deprecated.views.other.search', name='search'), - url(r'open-data/$', TemplateView.as_view(template_name='open-data.html'), + url(r'open-data/$', TemplateView.as_view(template_name='open-data.html'), name='opendata'), url(r'^archives/', include('super_archives.urls')), - + url(r'^api/', include('api.urls')), - + url(r'^rss/', include('rss.urls')), url(r'^user/', include('accounts.urls')), # Kept for backwards compatibility @@ -25,7 +28,11 @@ urlpatterns = patterns('', url(r'^planet/', include('feedzilla.urls')), (r'^browserid/', include('django_browserid.urls')), - + # Uncomment the next line to enable the admin: url(r'^colab/admin/', include(admin.site.urls)), + + # Trac URLs + url(u'^(?P(?:admin|wiki|changeset|newticket|ticket|chrome|timeline|roadmap|browser|report|tags|query|about|prefs|log|attachment|raw-attachment).*)$', + 'revproxy.views.proxy', {'base_url': settings.COLAB_TRAC_URL}) ) -- libgit2 0.21.2