Download as
Browse Code »

Commit 493032bc38293f9c34241cb970ded71679bd177d

Authored by Antonio Terceiro
1 parent 79bcb918
Exists in r5_design and in 1 other branch design_41_backup

noosfero: switch to port 80

Showing 3 changed files with 5 additions and 5 deletions   Show diff stats
cookbooks/colab/templates/01-apps.yaml.erb
  Diff comments   View file @493032b
@@ -3,4 +3,4 @@ PROXIED_APPS: @@ -3,4 +3,4 @@ PROXIED_APPS:
3 gitlab: 3 gitlab:
4 upstream: 'http://<%= node['peers']['integration'] %>:81/gitlab/' 4 upstream: 'http://<%= node['peers']['integration'] %>:81/gitlab/'
5 noosfero: 5 noosfero:
6 - upstream: 'http://<%= node['peers']['social'] %>:8080/social/' 6 + upstream: 'http://<%= node['peers']['social'] %>:80/social/'
cookbooks/noosfero/templates/nginx.conf.erb
  Diff comments   View file @493032b
@@ -7,8 +7,8 @@ upstream noosfero { @@ -7,8 +7,8 @@ upstream noosfero {
7 } 7 }
8 8
9 server { 9 server {
10 - listen *:8080;  
11 - server_name <%= node['config']['external_hostname'] %>; 10 + listen *:80;
  11 + server_name <%= node['config']['external_hostname'] %> <%= node['peers']['social'] %>;
12 underscores_in_headers on; 12 underscores_in_headers on;
13 access_log /var/log/nginx/noosfero.access.log; 13 access_log /var/log/nginx/noosfero.access.log;
14 error_log /var/log/nginx/noosfero.error.log; 14 error_log /var/log/nginx/noosfero.error.log;
test/noosfero_test.sh
  Diff comments   View file @493032b
@@ -14,12 +14,12 @@ test_noosfero_on_subdir() { @@ -14,12 +14,12 @@ test_noosfero_on_subdir() {
14 } 14 }
15 15
16 test_reverse_proxy_noosfero() { 16 test_reverse_proxy_noosfero() {
17 - local meta="$(run_on social curl-host softwarepublico.dev http://localhost:8080/social | sed -e '/noosfero:root/ !d; s/^\s*//')" 17 + local meta="$(run_on social curl-host softwarepublico.dev http://localhost/social | sed -e '/noosfero:root/ !d; s/^\s*//')"
18 assertEquals '<meta property="noosfero:root" content="/social"/>' "$meta" 18 assertEquals '<meta property="noosfero:root" content="/social"/>' "$meta"
19 } 19 }
20 20
21 test_reverse_proxy_static_files() { 21 test_reverse_proxy_static_files() {
22 - local content_type="$(curl-host softwarepublico.dev --head http://$social:8080/social/images/noosfero-network.png | grep-header Content-Type)" 22 + local content_type="$(curl-host softwarepublico.dev --head http://$social/social/images/noosfero-network.png | grep-header Content-Type)"
23 assertEquals "Content-Type: image/png" "$content_type" 23 assertEquals "Content-Type: image/png" "$content_type"
24 } 24 }
25 25