diff options
author | Marin Jankovski <marin@gitlab.com> | 2014-09-10 17:28:01 +0400 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2014-09-10 17:28:01 +0400 |
commit | c091e6cfff8a00eb28e40fd0233e519776b64a24 (patch) | |
tree | e6a25514c6c1f1e248a73061a0dc0b9142bf6be1 | |
parent | 622520490460891391a4212f8fc94baaec79f5c2 (diff) | |
parent | f905abc03a22a8bebebd5cbdde645d4f614fab10 (diff) |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
-rw-r--r-- | doc/install/installation.md | 16 | ||||
-rw-r--r-- | doc/update/mysql_to_postgresql.md | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 0fdd48aeb05..7a0b4e1f934 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -356,16 +356,16 @@ To use GitLab with HTTPS: 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: - 1. Generate a self-signed SSL certificate: - ``` - mkdir -p /etc/nginx/ssl/ - cd /etc/nginx/ssl/ - sudo openssl req -newkey rsa:2048 -x509 -nodes -days 3560 -out gitlab.crt -keyout gitlab.key - sudo chmod o-r gitlab.key - ``` +1. Generate a self-signed SSL certificate: - 1. In the `config.yml` of gitlab-shell set `self_signed_cert` to `true`. + ``` + mkdir -p /etc/nginx/ssl/ + cd /etc/nginx/ssl/ + sudo openssl req -newkey rsa:2048 -x509 -nodes -days 3560 -out gitlab.crt -keyout gitlab.key + sudo chmod o-r gitlab.key + ``` +1. In the `config.yml` of gitlab-shell set `self_signed_cert` to `true`. ### Additional Markup Styles diff --git a/doc/update/mysql_to_postgresql.md b/doc/update/mysql_to_postgresql.md index ed72e156efe..695c083d361 100644 --- a/doc/update/mysql_to_postgresql.md +++ b/doc/update/mysql_to_postgresql.md @@ -21,6 +21,9 @@ sudo -u git psql -f databasename.psql -d gitlabhq_production # 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 ``` |