From 69a31ac314d93abba197f860d5720d130605c635 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 1 Apr 2015 14:45:02 -0300 Subject: [PATCH] Switch gitlab to port 81 --- cookbooks/colab/templates/01-apps.yaml.erb | 2 +- cookbooks/gitlab/templates/nginx.conf.erb | 2 +- test/gitlab_test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbooks/colab/templates/01-apps.yaml.erb b/cookbooks/colab/templates/01-apps.yaml.erb index 3ce5820..e4c67c9 100644 --- a/cookbooks/colab/templates/01-apps.yaml.erb +++ b/cookbooks/colab/templates/01-apps.yaml.erb @@ -1,6 +1,6 @@ ### Colab proxied apps PROXIED_APPS: gitlab: - upstream: 'http://<%= node['peers']['integration'] %>:8081/gitlab/' + upstream: 'http://<%= node['peers']['integration'] %>:81/gitlab/' noosfero: upstream: 'http://<%= node['peers']['social'] %>:8080/social/' diff --git a/cookbooks/gitlab/templates/nginx.conf.erb b/cookbooks/gitlab/templates/nginx.conf.erb index 80a64e2..0adf13b 100644 --- a/cookbooks/gitlab/templates/nginx.conf.erb +++ b/cookbooks/gitlab/templates/nginx.conf.erb @@ -3,7 +3,7 @@ upstream gitlab { } server { - listen *:8081; + listen *:81; server_name <%= node['config']['external_hostname'] %>; underscores_in_headers on; diff --git a/test/gitlab_test.sh b/test/gitlab_test.sh index 834147b..1d24608 100644 --- a/test/gitlab_test.sh +++ b/test/gitlab_test.sh @@ -14,7 +14,7 @@ test_gitlab_responds() { test_static_content_served_correctly() { file=$(run_on integration ls -1 '/usr/lib/gitlab/public/assets/*.css' | head -1 | xargs basename) - assertTrue 'gitlab static content served by nginx' "run_on integration curl --head http://localhost:8081/gitlab/assets/$file | grep 'Content-Type: text/css'" + assertTrue 'gitlab static content served by nginx' "run_on integration curl --head http://localhost:81/gitlab/assets/$file | grep 'Content-Type: text/css'" } test_redirects_to_the_correct_host() { -- libgit2 0.21.2