Commit 0b3b615a606a27b38bd5d27daa2c8b5cb3672714
1 parent
54ede798
Exists in
master
and in
9 other branches
Move misplaced sections under Configuration
Showing
1 changed file
with
45 additions
and
45 deletions
Show diff stats
README.md
@@ -266,6 +266,51 @@ Run `sudo gitlab-ctl reconfigure` for changes in `gitlab.rb` to take effect. | @@ -266,6 +266,51 @@ Run `sudo gitlab-ctl reconfigure` for changes in `gitlab.rb` to take effect. | ||
266 | Do not edit the generated file in `/var/opt/gitlab/gitlab-rails/etc/gitlab.yml` | 266 | Do not edit the generated file in `/var/opt/gitlab/gitlab-rails/etc/gitlab.yml` |
267 | since it will be overwritten on the next `gitlab-ctl reconfigure` run. | 267 | since it will be overwritten on the next `gitlab-ctl reconfigure` run. |
268 | 268 | ||
269 | +### Specify numeric user and group identifiers | ||
270 | + | ||
271 | +Omnibus-gitlab creates users for GitLab, PostgreSQL and Redis. You can specify | ||
272 | +the numeric identifiers for these users in `/etc/gitlab/gitlab.rb` as follows. | ||
273 | + | ||
274 | +```ruby | ||
275 | +user['uid'] = 1234 | ||
276 | +user['gid'] = 1234 | ||
277 | +postgresql['uid'] = 1235 | ||
278 | +postgresql['gid'] = 1235 | ||
279 | +redis['uid'] = 1236 | ||
280 | +redis['gid'] = 1236 | ||
281 | +``` | ||
282 | + | ||
283 | +### Storing user attachments on Amazon S3 | ||
284 | + | ||
285 | +Instead of using local storage you can also store the user attachments for your | ||
286 | +GitLab instance on Amazon S3. | ||
287 | + | ||
288 | +``` | ||
289 | +# /etc/gitlab/gitlab.rb | ||
290 | +gitlab_rails['aws_enable'] = true | ||
291 | +gitlab_rails['aws_access_key_id'] = 'AKIA1111111111111UA' | ||
292 | +gitlab_rails['aws_secret_access_key'] = 'secret' | ||
293 | +gitlab_rails['aws_bucket'] = 'my_gitlab_bucket' | ||
294 | +gitlab_rails['aws_region'] = 'us-east-1' | ||
295 | +``` | ||
296 | + | ||
297 | +### Sending application email via SMTP | ||
298 | + | ||
299 | +If you would rather send email via an SMTP server instead of via Sendmail, add | ||
300 | +the following configuration information to `/etc/gitlab/gitlab.rb` and run | ||
301 | +`gitlab-ctl reconfigure`. | ||
302 | + | ||
303 | +``` | ||
304 | +gitlab_rails['smtp_enable'] = true | ||
305 | +gitlab_rails['smtp_address'] = "smtp.server" | ||
306 | +gitlab_rails['smtp_port'] = 456 | ||
307 | +gitlab_rails['smtp_user_name'] = "smtp user" | ||
308 | +gitlab_rails['smtp_password'] = "smtp password" | ||
309 | +gitlab_rails['smtp_domain'] = "example.com" | ||
310 | +gitlab_rails['smtp_authentication'] = "login" | ||
311 | +gitlab_rails['smtp_enable_starttls_auto'] = true | ||
312 | +``` | ||
313 | + | ||
269 | ## Backups | 314 | ## Backups |
270 | 315 | ||
271 | ### Creating an application backup | 316 | ### Creating an application backup |
@@ -412,51 +457,6 @@ sudo gitlab-rake gitlab:setup | @@ -412,51 +457,6 @@ sudo gitlab-rake gitlab:setup | ||
412 | 457 | ||
413 | This is a destructive command; do not run it on an existing database! | 458 | This is a destructive command; do not run it on an existing database! |
414 | 459 | ||
415 | -## Specify numeric user and group identifiers | ||
416 | - | ||
417 | -Omnibus-gitlab creates users for GitLab, PostgreSQL and Redis. You can specify | ||
418 | -the numeric identifiers for these users in `/etc/gitlab/gitlab.rb` as follows. | ||
419 | - | ||
420 | -```ruby | ||
421 | -user['uid'] = 1234 | ||
422 | -user['gid'] = 1234 | ||
423 | -postgresql['uid'] = 1235 | ||
424 | -postgresql['gid'] = 1235 | ||
425 | -redis['uid'] = 1236 | ||
426 | -redis['gid'] = 1236 | ||
427 | -``` | ||
428 | - | ||
429 | -## Storing user attachments on Amazon S3 | ||
430 | - | ||
431 | -Instead of using local storage you can also store the user attachments for your | ||
432 | -GitLab instance on Amazon S3. | ||
433 | - | ||
434 | -``` | ||
435 | -# /etc/gitlab/gitlab.rb | ||
436 | -gitlab_rails['aws_enable'] = true | ||
437 | -gitlab_rails['aws_access_key_id'] = 'AKIA1111111111111UA' | ||
438 | -gitlab_rails['aws_secret_access_key'] = 'secret' | ||
439 | -gitlab_rails['aws_bucket'] = 'my_gitlab_bucket' | ||
440 | -gitlab_rails['aws_region'] = 'us-east-1' | ||
441 | -``` | ||
442 | - | ||
443 | -## Sending application email via SMTP | ||
444 | - | ||
445 | -If you would rather send email via an SMTP server instead of via Sendmail, add | ||
446 | -the following configuration information to `/etc/gitlab/gitlab.rb` and run | ||
447 | -`gitlab-ctl reconfigure`. | ||
448 | - | ||
449 | -``` | ||
450 | -gitlab_rails['smtp_enable'] = true | ||
451 | -gitlab_rails['smtp_address'] = "smtp.server" | ||
452 | -gitlab_rails['smtp_port'] = 456 | ||
453 | -gitlab_rails['smtp_user_name'] = "smtp user" | ||
454 | -gitlab_rails['smtp_password'] = "smtp password" | ||
455 | -gitlab_rails['smtp_domain'] = "example.com" | ||
456 | -gitlab_rails['smtp_authentication'] = "login" | ||
457 | -gitlab_rails['smtp_enable_starttls_auto'] = true | ||
458 | -``` | ||
459 | - | ||
460 | ## Building your own package | 460 | ## Building your own package |
461 | 461 | ||
462 | See [the separate build documentation](doc/build.md). | 462 | See [the separate build documentation](doc/build.md). |