Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
4bf24d23
Commit
4bf24d23
authored
10 years ago
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
29f99000
5ac01994
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
doc/install/database_mysql.md
doc/install/database_mysql.md
+2
-2
lib/support/nginx/gitlab
lib/support/nginx/gitlab
+1
-1
lib/support/nginx/gitlab-ssl
lib/support/nginx/gitlab-ssl
+1
-1
No files found.
doc/install/database_mysql.md
View file @
4bf24d23
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
lib/support/nginx/gitlab
View file @
4bf24d23
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
lib/support/nginx/gitlab-ssl
View file @
4bf24d23
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment