Download as
Browse Code »

Commit 77de0659cfedcadee80232f0295284a3e217b123

Authored by Sergio Oliveira
1 parent 25d61d7a
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

Adding configs to reverse proxy and auth jenkins

Showing 3 changed files with 5 additions and 0 deletions   Show diff stats
@@ -22,6 +22,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| @@ -22,6 +22,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
22 config.vm.network :forwarded_port, guest: 80, host: 8080 22 config.vm.network :forwarded_port, guest: 80, host: 8080
23 config.vm.network :forwarded_port, guest: 7000, host: 8000 23 config.vm.network :forwarded_port, guest: 7000, host: 8000
24 config.vm.network :forwarded_port, guest: 5280, host: 5280 24 config.vm.network :forwarded_port, guest: 5280, host: 5280
  25 + config.vm.network :forwarded_port, guest: 8080, host: 8081
25 26
26 # Create a private network, which allows host-only access to the machine 27 # Create a private network, which allows host-only access to the machine
27 # using a specific IP. 28 # using a specific IP.
src/colab/custom_settings.py
  Diff comments   View file @77de065
@@ -176,6 +176,7 @@ SOLR_BASE_QUERY = """ @@ -176,6 +176,7 @@ SOLR_BASE_QUERY = """
176 """ 176 """
177 177
178 COLAB_TRAC_URL = 'http://colab-backend.interlegis.leg.br/' 178 COLAB_TRAC_URL = 'http://colab-backend.interlegis.leg.br/'
  179 +COLAB_CI_URL = 'http://jenkins.interlegis.leg.br:8080/ci/'
179 180
180 REVPROXY_ADD_REMOTE_USER = True 181 REVPROXY_ADD_REMOTE_USER = True
181 182
src/colab/urls.py
  Diff comments   View file @77de065
@@ -35,4 +35,7 @@ urlpatterns = patterns('', @@ -35,4 +35,7 @@ urlpatterns = patterns('',
35 # Trac URLs 35 # Trac URLs
36 url(u'^(?P<path>(?:admin|wiki|changeset|newticket|ticket|chrome|timeline|roadmap|browser|report|tags|query|about|prefs|log|attachment|raw-attachment).*)$', 36 url(u'^(?P<path>(?:admin|wiki|changeset|newticket|ticket|chrome|timeline|roadmap|browser|report|tags|query|about|prefs|log|attachment|raw-attachment).*)$',
37 'revproxy.views.proxy', {'base_url': settings.COLAB_TRAC_URL}), 37 'revproxy.views.proxy', {'base_url': settings.COLAB_TRAC_URL}),
  38 +
  39 + # Jenkins URLs
  40 + url(u'^ci/(?P<path>.*)$', 'revproxy.views.proxy', {'base_url': settings.COLAB_CI_URL}),
38 ) 41 )