diff --git a/src/colab/local_settings-dev.py b/src/colab/local_settings-dev.py index 94016d0..9f6c306 100644 --- a/src/colab/local_settings-dev.py +++ b/src/colab/local_settings-dev.py @@ -32,7 +32,7 @@ DATABASES['trac']['HOST'] = 'localhost' HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/' -COLAB_TRAC_URL = 'http://localhost:5000/' +COLAB_TRAC_URL = 'http://localhost:5000/trac/' COLAB_CI_URL = 'http://localhost:8080/ci/' COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/' COLAB_REDMINE_URL = 'http://localhost:9080/redmine/' diff --git a/src/proxy/urls.py b/src/proxy/urls.py index d4f8886..c755915 100644 --- a/src/proxy/urls.py +++ b/src/proxy/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, include, url -from .views import TracProxyView, JenkinsProxyView +from .views import ProxyView, JenkinsProxyView, GitlabProxyView, RedmineProxyView, TracProxyView urlpatterns = patterns('', @@ -11,4 +11,14 @@ urlpatterns = patterns('', # Jenkins URLs url(r'^ci/(?P.*)$', JenkinsProxyView.as_view()), + + # Trac + url(r'^trac/(?P.*)$', TracProxyView.as_view()), + + # Gitlab + url(r'^gitlab/(?P.*)$', GitlabProxyView.as_view()), + + # Redmine + url(r'^redmine/(?P.*)$', RedmineProxyView.as_view()) + ) diff --git a/src/proxy/views.py b/src/proxy/views.py index eb5efcb..56d864b 100644 --- a/src/proxy/views.py +++ b/src/proxy/views.py @@ -55,3 +55,18 @@ class JenkinsProxyView(ProxyView): diazo_theme_template = 'base.html' diazo_rules = os.path.join(DIAZO_RULES_DIR, 'jenkins.xml') html5 = True + +class GitlabProxyView(ProxyView): + base_url = settings.COLAB_GITLAB_URL + add_remote_user = settings.REVPROXY_ADD_REMOTE_USER + diazo_theme_template = 'proxy/gitlab.html' + diazo_rules = os.path.join(DIAZO_RULES_DIR, 'gitlab.xml') + html5 = True + +class RedmineProxyView(ProxyView): + base_url = settings.COLAB_REDMINE_URL + add_remote_user = settings.REVPROXY_ADD_REMOTE_USER + diazo_theme_template = 'proxy/redmine.html' + diazo_rules = os.path.join(DIAZO_RULES_DIR, 'redmine.xml') + html5 = True + -- libgit2 0.21.2