Commit c091e6cf authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

parents 62252049 f905abc0
...@@ -356,7 +356,8 @@ To use GitLab with HTTPS: ...@@ -356,7 +356,8 @@ To use GitLab with HTTPS:
1. Review the configuration file and consider applying other security and performance enhancing features. 1. Review the configuration file and consider applying other security and performance enhancing features.
Using a self-signed certificate is discouraged but if you must use it follow the normal directions then: Using a self-signed certificate is discouraged but if you must use it follow the normal directions then:
1. Generate a self-signed SSL certificate:
1. Generate a self-signed SSL certificate:
``` ```
mkdir -p /etc/nginx/ssl/ mkdir -p /etc/nginx/ssl/
...@@ -364,8 +365,7 @@ Using a self-signed certificate is discouraged but if you must use it follow the ...@@ -364,8 +365,7 @@ Using a self-signed certificate is discouraged but if you must use it follow the
sudo openssl req -newkey rsa:2048 -x509 -nodes -days 3560 -out gitlab.crt -keyout gitlab.key sudo openssl req -newkey rsa:2048 -x509 -nodes -days 3560 -out gitlab.crt -keyout gitlab.key
sudo chmod o-r gitlab.key sudo chmod o-r gitlab.key
``` ```
1. In the `config.yml` of gitlab-shell set `self_signed_cert` to `true`.
1. In the `config.yml` of gitlab-shell set `self_signed_cert` to `true`.
### Additional Markup Styles ### Additional Markup Styles
......
...@@ -21,6 +21,9 @@ sudo -u git psql -f databasename.psql -d gitlabhq_production ...@@ -21,6 +21,9 @@ sudo -u git psql -f databasename.psql -d gitlabhq_production
# Rebuild indexes (see below) # Rebuild indexes (see below)
# Install gems for PostgreSQL (note: the line below states '--without ... mysql')
sudo -u git -H bundle install --without development test mysql --deployment
sudo service gitlab start sudo service gitlab start
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment