From 669a709bf4bbfbb1dbcfcb187225eb5aeba2f8d6 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Mon, 1 Sep 2014 11:16:37 +0530 Subject: [PATCH] readme: moved "Run under sub URI" before "Putting it all together" section --- README.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 54711483..a38891c2 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,8 @@ - [Using HTTPS with a load balancer](#using-https-with-a-load-balancer) - [Establishing trust with your server](#establishing-trust-with-your-server) - [Installing Trusted SSL Server Certificates](#installing-trusted-ssl-server-certificates) - - [Putting it all together](#putting-it-all-together) - [Run under sub URI](#run-under-sub-uri) + - [Putting it all together](#putting-it-all-together) - [OmniAuth Integration](#omniauth-integration) - [Google](#google) - [Twitter](#twitter) @@ -636,6 +636,20 @@ Copy the `ca.crt` file into the certs directory on the [datastore](#data-store). By default, our own server certificate [gitlab.crt](#generation-of-self-signed-certificates) is added to the trusted certificates list. +### Run under sub URI + +If you like to serve the GitLab under sub URI like http://localhost/gitlab, set `-e 'GITLAB_RELATIVE_URL_ROOT=/gitlab'` or anything you like. +The path should start with slash, and should not have any trailing slashes. + +```bash +docker run --name=gitlab -d \ + -v /opt/gitlab/data:/home/git/data \ + -e 'GITLAB_RELATIVE_URL_ROOT=/gitlab' \ + sameersbn/gitlab:7.2.1 +``` + +When you change the sub URI path, you need to recompile all precompiled assets. This can be done by `rm -rf /PATH/TO/DATA_STORE/tmp`. After cleaning up cache files, restart the container. + ### Putting it all together ```bash @@ -658,20 +672,6 @@ docker run --name=gitlab -d -h git.local.host \ sameersbn/gitlab:7.2.1 ``` -### Run under sub URI - -If you like to serve the GitLab under sub URI like http://localhost/gitlab, set `-e 'GITLAB_RELATIVE_URL_ROOT=/gitlab'` or anything you like. -The path should start with slash, and should not have any trailing slashes. - -```bash -docker run --name=gitlab -d \ - -v /opt/gitlab/data:/home/git/data \ - -e 'GITLAB_RELATIVE_URL_ROOT=/gitlab' \ - sameersbn/gitlab:7.2.1 -``` - -When you change the sub URI path, you need to recompile all precompiled assets. This can be done by `rm -rf /PATH/TO/DATA_STORE/tmp`. After cleaning up cache files, restart the container. - ### OmniAuth Integration GitLab leverages OmniAuth to allow users to sign in using Twitter, GitHub, and other popular services. Configuring OmniAuth does not prevent standard GitLab authentication or LDAP (if configured) from continuing to work. Users can choose to sign in using any of the configured mechanisms.