From 7cb74cb16d3a5fb1e75eae71bfbd0bcb33e3860a Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Fri, 10 Jun 2016 12:35:11 +0800
Subject: [PATCH] update gitlab

---
 gitlab/README.md          | 10 +++++++---
 gitlab/docker-compose.yml |  5 +++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gitlab/README.md b/gitlab/README.md
index 28957d6..7e0e898 100644
--- a/gitlab/README.md
+++ b/gitlab/README.md
@@ -10,10 +10,11 @@ deployment tool.
 ```
 gitlab:
   image: gitlab/gitlab-ce
-  hostname: gitlab.example.com
+  hostname: git.example.com
   environment:
     GITLAB_OMNIBUS_CONFIG: |
-      external_url 'https://gitlab.example.com'
+      external_url 'https://git.example.com'
+      nginx['redirect_http_to_https'] = true
   ports:
     - "22:22"
     - "80:80"
@@ -25,6 +26,8 @@ gitlab:
   restart: always
 ```
 
+> You can put TLS crt+key into `./gitlab/config/ssl/`.
+
 ## up and running
 
 ```
@@ -36,7 +39,7 @@ $ systemctl restart ssh
 
 $ docker-compose up -d
 
-$ firefox https://gitlab.example.com
+$ firefox https://git.example.com
 ```
 
 ## backup volumes
@@ -54,5 +57,6 @@ $ tar tzf gitlab.tgz
 ## read more
 
 - http://docs.gitlab.com/omnibus/docker/
+- https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/nginx.md
 
 [1]: https://gitlab.com/
diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml
index 10c174c..28987cb 100644
--- a/gitlab/docker-compose.yml
+++ b/gitlab/docker-compose.yml
@@ -1,9 +1,10 @@
 gitlab:
   image: gitlab/gitlab-ce
-  hostname: gitlab.example.com
+  hostname: git.example.com
   environment:
     GITLAB_OMNIBUS_CONFIG: |
-      external_url 'https://gitlab.example.com'
+      external_url 'https://git.example.com'
+      nginx['redirect_http_to_https'] = true
   ports:
     - "22:22"
     - "80:80"