summaryrefslogtreecommitdiff
path: root/lib/support
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytses@gmail.com>2014-09-08 11:05:19 +0200
committerSytse Sijbrandij <sytses@gmail.com>2014-09-08 11:05:19 +0200
commitbef923055b712c19b01f6f3256f950eb1e8ad319 (patch)
tree7d6ff9cc217a32a715ae193339bcc0981b76248a /lib/support
parent8904d86b7d57fbf21d1c69515e06315cbe6a5a0a (diff)
parent5d5d4ef91a31d39f15662a6a6bd8a314d860e608 (diff)
downloadgitlab-ce-bef923055b712c19b01f6f3256f950eb1e8ad319.tar.gz
Merge pull request #7583 from bbodenmiller/https
[Documentation] simplify HTTPS setup details
Diffstat (limited to 'lib/support')
-rw-r--r--lib/support/nginx/gitlab-ssl13
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl
index 628439a0cf3..0ba9d055c8c 100644
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -26,23 +26,12 @@
## [1] https://github.com/agentzh/chunkin-nginx-module#status
## [2] https://github.com/agentzh/chunkin-nginx-module
##
-###################################
-## SSL file editing ##
-###################################
-##
-## Edit `gitlab-shell/config.yml`:
-## 1) Set "gitlab_url" param in `gitlab-shell/config.yml` to `https://git.example.com`
-## 2) Set "ca_file" to `/etc/nginx/ssl/gitlab.crt`
-## 3) Set "self_signed_cert" to `true`
-## Edit `gitlab/config/gitlab.yml`:
-## 1) Define port for http "port: 443"
-## 2) Enable https "https: true"
-## 3) Update ssl for gravatar "ssl_url: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm"
##
###################################
## SSL configuration ##
###################################
##
+## See installation.md#using-https for additional HTTPS configuration details.
upstream gitlab {
server unix:/home/git/gitlab/tmp/sockets/gitlab.socket;