Commit 69a31ac314d93abba197f860d5720d130605c635
1 parent
9777059f
Exists in
master
and in
90 other branches
Switch gitlab to port 81
On SELinux-enabled systems there is a restriction on which ports you can actually bind to. 81 is allowed by the defautl configuration so let's go with that.
Showing
3 changed files
with
3 additions
and
3 deletions
Show diff stats
cookbooks/colab/templates/01-apps.yaml.erb
1 | ### Colab proxied apps | 1 | ### Colab proxied apps |
2 | PROXIED_APPS: | 2 | PROXIED_APPS: |
3 | gitlab: | 3 | gitlab: |
4 | - upstream: 'http://<%= node['peers']['integration'] %>:8081/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'] %>:8080/social/' |
cookbooks/gitlab/templates/nginx.conf.erb
@@ -3,7 +3,7 @@ upstream gitlab { | @@ -3,7 +3,7 @@ upstream gitlab { | ||
3 | } | 3 | } |
4 | 4 | ||
5 | server { | 5 | server { |
6 | - listen *:8081; | 6 | + listen *:81; |
7 | 7 | ||
8 | server_name <%= node['config']['external_hostname'] %>; | 8 | server_name <%= node['config']['external_hostname'] %>; |
9 | underscores_in_headers on; | 9 | underscores_in_headers on; |
test/gitlab_test.sh
@@ -14,7 +14,7 @@ test_gitlab_responds() { | @@ -14,7 +14,7 @@ test_gitlab_responds() { | ||
14 | 14 | ||
15 | test_static_content_served_correctly() { | 15 | test_static_content_served_correctly() { |
16 | file=$(run_on integration ls -1 '/usr/lib/gitlab/public/assets/*.css' | head -1 | xargs basename) | 16 | file=$(run_on integration ls -1 '/usr/lib/gitlab/public/assets/*.css' | head -1 | xargs basename) |
17 | - assertTrue 'gitlab static content served by nginx' "run_on integration curl --head http://localhost:8081/gitlab/assets/$file | grep 'Content-Type: text/css'" | 17 | + assertTrue 'gitlab static content served by nginx' "run_on integration curl --head http://localhost:81/gitlab/assets/$file | grep 'Content-Type: text/css'" |
18 | } | 18 | } |
19 | 19 | ||
20 | test_redirects_to_the_correct_host() { | 20 | test_redirects_to_the_correct_host() { |