Download as
Browse Code »

Commit dd52c6ea4f4d568b8719bf6d0fbc85e3afa7d50a

Authored by Sergio Oliveira
1 parent 61703182
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 config to puppet

Showing 1 changed file with 14 additions and 1 deletions   Show diff stats
puppet/modules/colab/templates/nginx/site_default.erb
  Diff comments   View file @dd52c6e
@@ -12,7 +12,7 @@ server { @@ -12,7 +12,7 @@ server {
12 listen 80; 12 listen 80;
13 13
14 root /; 14 root /;
15 - server_name colab.interlegis.leg.br colab.interlegis.gov.br colab-demo.tracy.com.br localhost; 15 + server_name colab.interlegis.leg.br colab01a.interlegis.leg.br colab01b.interlegis.leg.br colab.interlegis.gov.br colab-demo.tracy.com.br localhost;
16 16
17 location @django { 17 location @django {
18 proxy_hide_header Vary; 18 proxy_hide_header Vary;
@@ -23,10 +23,23 @@ server { @@ -23,10 +23,23 @@ server {
23 proxy_redirect off; 23 proxy_redirect off;
24 proxy_set_header X-Real-IP $remote_addr; 24 proxy_set_header X-Real-IP $remote_addr;
25 proxy_set_header X-Scheme $scheme; 25 proxy_set_header X-Scheme $scheme;
  26 + proxy_set_header X-Forwarded-Protocol https;
26 proxy_pass http://django; 27 proxy_pass http://django;
27 access_log /var/log/nginx/proxy-access.log proxy; 28 access_log /var/log/nginx/proxy-access.log proxy;
28 } 29 }
29 30
  31 + location /http-bind {
  32 + proxy_pass http://127.0.0.1:5280;
  33 + }
  34 +
  35 + location /chrome {
  36 + proxy_pass http://ambientedev01a.interlegis.leg.br;
  37 + }
  38 +
  39 + location /raw-attachment {
  40 + proxy_pass http://ambientedev01a.interlegis.leg.br;
  41 + }
  42 +
30 location / { 43 location / {
31 try_files /home/colab/colab/www$uri @django; 44 try_files /home/colab/colab/www$uri @django;
32 } 45 }