diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-09-12 19:03:10 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-09-12 19:03:10 +0200 |
| commit | 4bf24d239f1c1140405f19bfe63ffb99042f6e37 (patch) | |
| tree | a3927288f59b21e4e3e78f4bbfd0981abffdeef8 | |
| parent | 29f990002c6e2704bb25ba4aa89491f319699202 (diff) | |
| parent | 5ac019946f327852d9c355bbe95de1f0c1cfad59 (diff) | |
| download | gitlab-ce-4bf24d239f1c1140405f19bfe63ffb99042f6e37.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | doc/install/database_mysql.md | 4 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab | 2 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-ssl | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/install/database_mysql.md b/doc/install/database_mysql.md index 5e9bfff5653..362c492d0ac 100644 --- a/doc/install/database_mysql.md +++ b/doc/install/database_mysql.md @@ -28,14 +28,14 @@ We do not recommend using MySQL due to various issues. For example, case [(in)se # change $password in the command below to a real password you pick mysql> CREATE USER 'git'@'localhost' IDENTIFIED BY '$password'; - # Ensure you can use the InnoDB engine which is necessary to support long indexes. + # Ensure you can use the InnoDB engine which is necessary to support long indexes # If this fails, check your MySQL config files (e.g. `/etc/mysql/*.cnf`, `/etc/mysql/conf.d/*`) for the setting "innodb = off" mysql> SET storage_engine=INNODB; # Create the GitLab production database mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`; - # Grant the GitLab user necessary permissions on the table. + # Grant the GitLab user necessary permissions on the database mysql> GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER, LOCK TABLES ON `gitlabhq_production`.* TO 'git'@'localhost'; # Quit the database session diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab index 16b06fe006e..49a68c62293 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -28,7 +28,7 @@ ## upstream gitlab { - server unix:/home/git/gitlab/tmp/sockets/gitlab.socket; + server unix:/home/git/gitlab/tmp/sockets/gitlab.socket fail_timeout=0; } ## Normal HTTP host diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl index d2aa06fe7f6..19409e41f40 100644 --- a/lib/support/nginx/gitlab-ssl +++ b/lib/support/nginx/gitlab-ssl @@ -34,7 +34,7 @@ ## See installation.md#using-https for additional HTTPS configuration details. upstream gitlab { - server unix:/home/git/gitlab/tmp/sockets/gitlab.socket; + server unix:/home/git/gitlab/tmp/sockets/gitlab.socket fail_timeout=0; } ## Normal HTTP host |