From 76329a46a3aca95f918b72936bcd884de4956ff3 Mon Sep 17 00:00:00 2001
From: Riyad Preukschas <riyad@informatik.uni-bremen.de>
Date: Wed, 16 Jan 2013 23:54:48 +0100
Subject: Fix settings

---
 config/gitlab.yml.example | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'config/gitlab.yml.example')

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 764718ff1db..4103550acdb 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -18,10 +18,13 @@ gitlab:
   host: localhost
   port: 80
   https: false
-  # uncomment and customize to run in non-root path
-  # note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/unicorn.rb may need to be changed
+  # Uncomment and customize to run in non-root path
+  # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/unicorn.rb may need to be changed
   # relative_url_root: /gitlab
 
+  # Uncomment and customize if you can't use the default user to run GitLab (default: 'gitlab')
+  # user: user123
+
   ## Email settings
   # Email address used in the "From" field in mails sent by GitLab
   email_from: gitlab@localhost
@@ -29,9 +32,6 @@ gitlab:
   ## Project settings
   default_projects_limit: 10
 
-  ## Account used for GitLab installation ('gitlab' if undefined)
-  user: gitlab
-
 ## Gravatar
 gravatar:
   enabled: true                 # Use user avatar images from Gravatar.com (default: true)
@@ -88,8 +88,9 @@ omniauth:
 # ==========================
 
 # GitLab Satellites
-satellites: 
-  path: /home/gitlab/gitlab-satellites/ 
+satellites:
+  # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
+  path: /home/gitlab/gitlab-satellites/
 
 ## Backup settings
 backup:
@@ -107,10 +108,12 @@ gitolite:
   receive_pack: true
   ssh_user: git
   ssh_host: localhost
-  group: git # default: 'git' if undefined
   # ssh_port: 22
   # config_file: gitolite.conf
 
+  # Uncomment and customize if you can't use the default group to own the repositories and run Gitolite (default: same as the 'ssh_user' above)
+  # owner_group: group123
+
 ## Git settings
 # CAUTION!
 # Use the default values unless you really know what you are doing
-- 
cgit v1.2.3