Download as
Browse Code »

Commit 016dd3f60452b079e92db0a8b82deb6ba7d5dcd4

Authored by Sergio Oliveira
1 parent 46211987
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Fixing rules loader

Showing 1 changed file with 6 additions and 1 deletions   Show diff stats
src/proxy/views.py
  Diff comments   View file @016dd3f
@@ -6,14 +6,19 @@ from django.conf import settings @@ -6,14 +6,19 @@ from django.conf import settings
6 from revproxy.views import ProxyView 6 from revproxy.views import ProxyView
7 7
8 8
  9 +CWD = os.path.abspath(os.path.dirname(__file__))
  10 +DIAZO_RULES_DIR = os.path.join(CWD, 'diazo')
  11 +
  12 +
9 class TracProxyView(ProxyView): 13 class TracProxyView(ProxyView):
10 base_url = settings.COLAB_TRAC_URL 14 base_url = settings.COLAB_TRAC_URL
11 add_remote_user = settings.REVPROXY_ADD_REMOTE_USER 15 add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
12 diazo_theme_template = 'base.html' 16 diazo_theme_template = 'base.html'
13 - diazo_rules = os.path.join(settings.BASE_DIR, 'proxy', 'trac_rules.xml') 17 + diazo_rules = os.path.join(DIAZO_RULES_DIR, 'trac.xml')
14 18
15 19
16 class JenkinsProxyView(ProxyView): 20 class JenkinsProxyView(ProxyView):
17 base_url = settings.COLAB_CI_URL 21 base_url = settings.COLAB_CI_URL
18 add_remote_user = settings.REVPROXY_ADD_REMOTE_USER 22 add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
19 diazo_theme_template = 'base.html' 23 diazo_theme_template = 'base.html'
  24 + diazo_rules = os.path.join(DIAZO_RULES_DIR, 'jenkins.xml')