From 706648fb4d523557ccc5fd0fdd34f8da6ff26827 Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Mon, 30 Dec 2013 11:53:07 +0000 Subject: [PATCH 1/3] make mods to gitlab.yml to enable https to work correctly --- web-server/nginx/gitlab-ssl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web-server/nginx/gitlab-ssl b/web-server/nginx/gitlab-ssl index dbe75cd..48c7e77 100644 --- a/web-server/nginx/gitlab-ssl +++ b/web-server/nginx/gitlab-ssl @@ -11,6 +11,10 @@ # sudo chmod o-r gitlab.key # Also you need to edit gitlab-shell config. # Set "gitlab_url" param in gitlab-shell/config.yml to https://git.example.com +# You also need to edit gitlab/config/gitlab.yml +# 1) Define port for http: line 19 -- port: 443 +# 2) Enable https: line 20 -- https: true +# 3) Disable gravater: line 110 -- enabled: false upstream gitlab { From 5dec2a1dea99ba36f0e2ec1a92c8c13cac97c6e5 Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Mon, 30 Dec 2013 11:53:33 +0000 Subject: [PATCH 2/3] fix typo on gravatar --- web-server/nginx/gitlab-ssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-server/nginx/gitlab-ssl b/web-server/nginx/gitlab-ssl index 48c7e77..7cbc1a0 100644 --- a/web-server/nginx/gitlab-ssl +++ b/web-server/nginx/gitlab-ssl @@ -14,7 +14,7 @@ # You also need to edit gitlab/config/gitlab.yml # 1) Define port for http: line 19 -- port: 443 # 2) Enable https: line 20 -- https: true -# 3) Disable gravater: line 110 -- enabled: false +# 3) Disable gravatar: line 110 -- enabled: false upstream gitlab { From fbe8d4062062aae0482287f691a4044196ea23d2 Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Mon, 30 Dec 2013 21:11:59 +0000 Subject: [PATCH 3/3] removed reference line numbers --- web-server/nginx/gitlab-ssl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web-server/nginx/gitlab-ssl b/web-server/nginx/gitlab-ssl index 7cbc1a0..f8e9e19 100644 --- a/web-server/nginx/gitlab-ssl +++ b/web-server/nginx/gitlab-ssl @@ -12,9 +12,9 @@ # Also you need to edit gitlab-shell config. # Set "gitlab_url" param in gitlab-shell/config.yml to https://git.example.com # You also need to edit gitlab/config/gitlab.yml -# 1) Define port for http: line 19 -- port: 443 -# 2) Enable https: line 20 -- https: true -# 3) Disable gravatar: line 110 -- enabled: false +# 1) Define port for http: port: 443 +# 2) Enable https: https: true +# 3) Disable gravatar: enabled: false upstream gitlab {